Merge branch 'for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

[linux-2.6-microblaze.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index fdb4f52..b5294bc 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -36,6 +36,10 @@ config CC_CAN_LINK
 config CC_HAS_ASM_GOTO
        def_bool $(success,$(srctree)/scripts/gcc-goto.sh $(CC))
 
+config CC_HAS_ASM_GOTO_OUTPUT
+       depends on CC_HAS_ASM_GOTO
+       def_bool $(success,echo 'int foo(int x) { asm goto ("": "=r"(x) ::: bar); return x; bar: return 0; }' | $(CC) -x c - -c -o /dev/null)
+
 config TOOLS_SUPPORT_RELR
        def_bool $(success,env "CC=$(CC)" "LD=$(LD)" "NM=$(NM)" "OBJCOPY=$(OBJCOPY)" $(srctree)/scripts/tools-support-relr.sh)
 
@@ -260,6 +264,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)"