[PATCH v4 20/20] cmdline: Remove CONFIG_CMDLINE_EXTEND

Christophe Leroy
2021-04-02T15:18:22Z

All architectures providing CONFIG_CMDLINE_EXTEND
are now converted to GENERIC_CMDLINE.

This configuration item is not used anymore, drop it.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
include/linux/cmdline.h | 2 +-
init/Kconfig | 6 ------
2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/include/linux/cmdline.h b/include/linux/cmdline.h
index a0773dc365c7..020028e2bdf0 100644
--- a/include/linux/cmdline.h
+++ b/include/linux/cmdline.h
@@ -36,7 +36,7 @@ static __always_inline bool __cmdline_build(char *dst, const char *src)

len = cmdline_strlcat(dst, src, COMMAND_LINE_SIZE);

- if (IS_ENABLED(CONFIG_CMDLINE_EXTEND))
+ if (IS_ENABLED(CONFIG_CMDLINE_APPEND))
len = cmdline_strlcat(dst, " " CONFIG_CMDLINE, COMMAND_LINE_SIZE);

if (len < COMMAND_LINE_SIZE - 1)
diff --git a/init/Kconfig b/init/Kconfig
index af0d84662cc2..fa002e3765ab 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -163,12 +163,6 @@ config CMDLINE_FORCE
arguments provided by the bootloader.
endchoice

-config CMDLINE_EXTEND
- bool
- default CMDLINE_APPEND
- help
- To be removed once all architectures are converted to generic CMDLINE
-
config COMPILE_TEST
bool "Compile also drivers which will not load"
depends on HAS_IOMEM
--
2.25.0