1 files changed, 1 insertions, 12 deletions

diff --git a/init/Kconfig b/init/Kconfig
index f8f6929d8f25..25f4d74adf7e 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -230,9 +230,7 @@ source "usr/Kconfig"
 
 config UID16
         bool "Enable 16-bit UID system calls" if EMBEDDED
-        depends !ALPHA && !PPC && !PPC64 && !PARISC && !V850 && !ARCH_S390X
-        depends !X86_64 || IA32_EMULATION
-        depends !SPARC64 || SPARC32_COMPAT
+        depends on ARM || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && SPARC32_COMPAT) || UML || (X86_64 && IA32_EMULATION)
         default y
         help
           This enables the legacy 16-bit UID syscall wrappers.
@@ -328,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