[PATCH] menu: fix embedded menu order

[PATCH] menu: fix embedded menu order

[Randy Dunlap]

From: Randy Dunlap <randy.dunlap@oracle.com>

Fix Embedded menu order/structure.

The "EMBEDDED" menu display is broken, i.e., it is split apart,
not displayed entirely in one place, due to some symbols not being
listed as "if EMBEDDED".  Make them be displayed all together.

Tested with menuconfig, xconfig, & gconfig.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 init/Kconfig |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

--- lnx-2630-rc4.orig/init/Kconfig
+++ lnx-2630-rc4/init/Kconfig
@@ -786,7 +786,7 @@ config KALLSYMS
 	   somewhat, as all symbols have to be loaded into the kernel image.
 
 config KALLSYMS_ALL
-	bool "Include all symbols in kallsyms"
+	bool "Include all symbols in kallsyms" if EMBEDDED
 	depends on DEBUG_KERNEL && KALLSYMS
 	help
 	   Normally kallsyms only contains the symbols of functions, for nicer
@@ -797,7 +797,7 @@ config KALLSYMS_ALL
 	   Say N.
 
 config KALLSYMS_EXTRA_PASS
-	bool "Do an extra kallsyms pass"
+	bool "Do an extra kallsyms pass" if EMBEDDED
 	depends on KALLSYMS
 	help
 	   If kallsyms is not working correctly, the build will fail with
@@ -807,9 +807,8 @@ config KALLSYMS_EXTRA_PASS
 	   reported.  KALLSYMS_EXTRA_PASS is only a temporary workaround while
 	   you wait for kallsyms to be fixed.
 
-
 config STRIP_ASM_SYMS
-	bool "Strip assembler-generated symbols during link"
+	bool "Strip assembler-generated symbols during link" if EMBEDDED
 	default n
 	help
 	  Strip internal assembler-generated symbols during a link (symbols
@@ -961,6 +960,9 @@ config SLUB_DEBUG
 	  SLUB sysfs support. /sys/slab will not exist and there will be
 	  no support for cache validation etc.
 
+# end EMBEDDED menu -- don't put non-EMBEDDED items between
+# "menuconfig EMBEDDED" and here.
+
 config COMPAT_BRK
 	bool "Disable heap randomization"
 	default y