[PATCH] Kconfig refactoring for better menu nesting

Refactor Kconfig content to maximize nesting of menus by menuconfig and
xconfig.

Tested by simultaneously running `make xconfig` with and without
patch, and comparing displays.

Signed-off-by: Don Mullis <dwm@meer.net>
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 25 insertions, 24 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 6eccc643c32e..0701ddda1df8 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -47,6 +47,30 @@ config UNUSED_SYMBOLS
           you really need it, and what the merge plan to the mainline kernel for
           your module is.
 
+config DEBUG_FS
+        bool "Debug Filesystem"
+        depends on SYSFS
+        help
+          debugfs is a virtual file system that kernel developers use to put
+          debugging files into.  Enable this option to be able to read and
+          write to these files.
+
+          If unsure, say N.
+
+config HEADERS_CHECK
+        bool "Run 'make headers_check' when building vmlinux"
+        depends on !UML
+        help
+          This option will extract the user-visible kernel headers whenever
+          building the kernel, and will run basic sanity checks on them to
+          ensure that exported files do not attempt to include files which
+          were not exported, etc.
+
+          If you're making modifications to header files which are
+          relevant for userspace, say 'Y', and check the headers
+          exported to $(INSTALL_HDR_PATH) (usually 'usr/include' in
+          your build tree), to make sure they're suitable.
+
 config DEBUG_KERNEL
         bool "Kernel debugging"
         help
@@ -302,16 +326,6 @@ config DEBUG_INFO
 
           If unsure, say N.
 
-config DEBUG_FS
-        bool "Debug Filesystem"
-        depends on SYSFS
-        help
-          debugfs is a virtual file system that kernel developers use to put
-          debugging files into.  Enable this option to be able to read and
-          write to these files.
-
-          If unsure, say N.
-
 config DEBUG_VM
         bool "Debug VM"
         depends on DEBUG_KERNEL
@@ -372,20 +386,6 @@ config FORCED_INLINING
           become the default in the future, until then this option is there to
           test gcc for this.
 
-config HEADERS_CHECK
-        bool "Run 'make headers_check' when building vmlinux"
-        depends on !UML
-        help
-          This option will extract the user-visible kernel headers whenever
-          building the kernel, and will run basic sanity checks on them to
-          ensure that exported files do not attempt to include files which
-          were not exported, etc.
-
-          If you're making modifications to header files which are
-          relevant for userspace, say 'Y', and check the headers
-          exported to $(INSTALL_HDR_PATH) (usually 'usr/include' in
-          your build tree), to make sure they're suitable.
-
 config RCU_TORTURE_TEST
         tristate "torture tests for RCU"
         depends on DEBUG_KERNEL
@@ -402,6 +402,7 @@ config RCU_TORTURE_TEST
 
 config LKDTM
         tristate "Linux Kernel Dump Test Tool Module"
+        depends on DEBUG_KERNEL
         depends on KPROBES
         default n
         help