summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-04-18 12:35:22 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-18 10:39:20 -0700
commit102e41fd9dfee357b71e21a38eec3c86ff557bc1 (patch)
treeb3005c01208300f78771c726a2d59cc749413e45
parentf1233ab2cebb22a98df55de206a33a6693e3a78b (diff)
downloadop-kernel-dev-102e41fd9dfee357b71e21a38eec3c86ff557bc1.zip
op-kernel-dev-102e41fd9dfee357b71e21a38eec3c86ff557bc1.tar.gz
[PATCH] i386: Move CONFIG_DOUBLEFAULT into arch/i386 where it belongs.
Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/i386/Kconfig.debug9
-rw-r--r--init/Kconfig9
2 files changed, 9 insertions, 9 deletions
diff --git a/arch/i386/Kconfig.debug b/arch/i386/Kconfig.debug
index 6e97df6..c92191b 100644
--- a/arch/i386/Kconfig.debug
+++ b/arch/i386/Kconfig.debug
@@ -81,4 +81,13 @@ config X86_MPPARSE
depends on X86_LOCAL_APIC && !X86_VISWS
default y
+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 f1bc2f0..3b36a1d 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -374,15 +374,6 @@ 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