init: allow distribution configuration of default init

[platform/kernel/linux-rpi.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 74a5ac6..2d12d38 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -23,6 +23,9 @@ config LD_VERSION
 config CC_IS_CLANG
        def_bool $(success,$(CC) --version | head -n 1 | grep -q clang)
 
+config LD_IS_LLD
+       def_bool $(success,$(LD) -v | head -n 1 | grep -q LLD)
+
 config CLANG_VERSION
        int
        default $(shell,$(srctree)/scripts/clang-version.sh $(CC))
@@ -257,6 +260,16 @@ config KERNEL_UNCOMPRESSED
 
 endchoice
 
+config DEFAULT_INIT
+       string "Default init path"
+       default ""
+       help
+         This option determines the default init for the system if no init=
+         option is passed on the kernel command line. If the requested path is
+         not present, we will still then move on to attempting further
+         locations (e.g. /sbin/init, etc). If this is empty, we will just use
+         the fallback list when init= is not passed.
+
 config DEFAULT_HOSTNAME
        string "Default hostname"
        default "(none)"
@@ -819,24 +832,9 @@ config MEMCG
          Provides control over the memory footprint of tasks in a cgroup.
 
 config MEMCG_SWAP
-       bool "Swap controller"
+       bool
        depends on MEMCG && SWAP
-       help
-         Provides control over the swap space consumed by tasks in a cgroup.
-
-config MEMCG_SWAP_ENABLED
-       bool "Swap controller enabled by default"
-       depends on MEMCG_SWAP
        default y
-       help
-         Memory Resource Controller Swap Extension comes with its price in
-         a bigger memory consumption. General purpose distribution kernels
-         which want to enable the feature but keep it disabled by default
-         and let the user enable it by swapaccount=1 boot command line
-         parameter should have this option unselected.
-         For those who want to have the feature enabled by default should
-         select this option (if, for some reason, they need to disable it
-         then swapaccount=0 does the trick).
 
 config MEMCG_KMEM
        bool