diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-08-20 03:09:18 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-08-20 03:09:18 +0200 |
| commit | f444fea7896dbc267249d27f604082a51b8efca2 (patch) | |
| tree | d72e809d28ff7a1cb02f648c858d106de1be859d /init | |
| parent | octeontx2-af: remove redudant second error check on variable err (diff) | |
| parent | Merge tag 'net-5.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | linux-f444fea7896dbc267249d27f604082a51b8efca2.tar.xz linux-f444fea7896dbc267249d27f604082a51b8efca2.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/ptp/Kconfig:
55c8fca1dae1 ("ptp_pch: Restore dependency on PCI")
e5f31552674e ("ethernet: fix PTP_1588_CLOCK dependencies")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c index 11cbbec309fa..daad6979f782 100644 --- a/init/main.c +++ b/init/main.c @@ -397,6 +397,12 @@ static int __init bootconfig_params(char *param, char *val, return 0; } +static int __init warn_bootconfig(char *str) +{ + /* The 'bootconfig' has been handled by bootconfig_params(). */ + return 0; +} + static void __init setup_boot_config(void) { static char tmp_cmdline[COMMAND_LINE_SIZE] __initdata; @@ -475,9 +481,8 @@ static int __init warn_bootconfig(char *str) pr_warn("WARNING: 'bootconfig' found on the kernel command line but CONFIG_BOOT_CONFIG is not set.\n"); return 0; } -early_param("bootconfig", warn_bootconfig); - #endif +early_param("bootconfig", warn_bootconfig); /* Change NUL term back to "=", to make "param" the whole string. */ static void __init repair_env_string(char *param, char *val) |