2 files changed, 9 insertions, 9 deletions

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 81ae9627701d..d5d0df7f04fc 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -47,6 +47,15 @@ config DMI
 
 source "init/Kconfig"
 
+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.
+
 menu "Processor type and features"
 
 choice
diff --git a/init/Kconfig b/init/Kconfig
index 9bdd5492a95b..25f4d74adf7e 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -326,15 +326,6 @@ config BUG
           option for embedded systems with no facilities for reporting errors.
           Just say Y.
 
-config DOUBLEFAULT
-        depends X86
-        default y if X86
-        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.
-
 config ELF_CORE
         default y
         bool "Enable ELF core dumps" if EMBEDDED