[PATCH] menu: relocate DOUBLEFAULT option

Move the DOUBLEFAULT option from the top-level menu to the EMBEDDED menu.
Only applicable to X86_32.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index f17bd1d..cbc6be6 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -757,15 +757,6 @@ config HOTPLUG_CPU
 
          Say N.
 
 
          Say N.
 

-config DOUBLEFAULT
-       default y
-       bool "Enable doublefault exception handler" if EMBEDDED
-       help
-          This option allows trapping of rare doublefault exceptions that
-          would otherwise cause a system to silently reboot. Disabling this
-          option saves about 4k and might cause you much additional grey
-          hair.
-

 endmenu
 
 
 endmenu
 
 

diff --git a/init/Kconfig b/init/Kconfig
index 3b36a1d..f1bc2f0 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -374,6 +374,15 @@ config SLAB
          SLOB is more space efficient but does not scale well and is
          more susceptible to fragmentation.
 
          SLOB is more space efficient but does not scale well and is
          more susceptible to fragmentation.
 

+config DOUBLEFAULT
+       default y
+       bool "Enable doublefault exception handler" if EMBEDDED && X86_32
+       help
+          This option allows trapping of rare doublefault exceptions that
+          would otherwise cause a system to silently reboot. Disabling this
+          option saves about 4k and might cause you much additional grey
+          hair.
+

 endmenu                # General setup
 
 config TINY_SHMEM
 endmenu                # General setup
 
 config TINY_SHMEM