Merge branch 'master'

1 files changed, 0 insertions, 9 deletions

diff --git a/init/Kconfig b/init/Kconfig
index f1bc2f0e94e5..3b36a1d53656 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