summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@xenotime.net>2006-04-10 22:53:12 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-11 06:18:33 -0700
commite39632faa0efbddc3aed4f8658f2fa0a8afa2717 (patch)
treefa9e6cd489a698ca713c4690a0007a58f18bc9e2
parent7bee5c0fd2b25d185650cbfa049823e03f648c09 (diff)
downloadop-kernel-dev-e39632faa0efbddc3aed4f8658f2fa0a8afa2717.zip
op-kernel-dev-e39632faa0efbddc3aed4f8658f2fa0a8afa2717.tar.gz
[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>
-rw-r--r--arch/i386/Kconfig9
-rw-r--r--init/Kconfig9
2 files changed, 9 insertions, 9 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index f17bd1d..cbc6be6 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -757,15 +757,6 @@ config HOTPLUG_CPU
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
diff --git a/init/Kconfig b/init/Kconfig
index 3b36a1d..f1bc2f0 100644
--- 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.
+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
OpenPOWER on IntegriCloud