2 files changed, 49 insertions, 6 deletions

diff --git a/init/Kconfig b/init/Kconfig
index ba42f3793a84..f8f6929d8f25 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -228,6 +228,25 @@ config CPUSETS
 
 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
+        default y
+        help
+          This enables the legacy 16-bit UID syscall wrappers.
+
+config VM86
+        depends X86
+        default y
+        bool "Enable VM86 support" if EMBEDDED
+        help
+          This option is required by programs like DOSEMU to run 16-bit legacy
+          code on X86 processors. It also may be needed by software like
+          XFree86 to initialize some video cards via BIOS. Disabling this
+          option saves about 6k.
+
 config CC_OPTIMIZE_FOR_SIZE
         bool "Optimize for size (Look out for broken compilers!)"
         default y
@@ -309,6 +328,21 @@ 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
+        help
+          Enable support for generating core dumps. Disabling saves about 4k.
+
 config BASE_FULL
         default y
         bool "Enable full-sized data structures for core" if EMBEDDED
@@ -380,6 +414,15 @@ config CC_ALIGN_JUMPS
           no dummy operations need be executed.
           Zero means use compiler's default.
 
+config SLAB
+        default y
+        bool "Use full SLAB allocator" if EMBEDDED
+        help
+          Disabling this replaces the advanced SLAB allocator and
+          kmalloc support with the drastically simpler SLOB allocator.
+          SLOB is more space efficient but does not scale well and is
+          more susceptible to fragmentation.
+
 endmenu         # General setup
 
 config TINY_SHMEM
@@ -391,6 +434,10 @@ config BASE_SMALL
         default 0 if BASE_FULL
         default 1 if !BASE_FULL
 
+config SLOB
+        default !SLAB
+        bool
+
 menu "Loadable module support"
 
 config MODULES
diff --git a/init/main.c b/init/main.c
index 2ed3638deec7..8342c2890b16 100644
--- a/init/main.c
+++ b/init/main.c
@@ -58,11 +58,6 @@
  * This is one of the first .c files built. Error out early
  * if we have compiler trouble..
  */
-#if __GNUC__ == 2 && __GNUC_MINOR__ == 96
-#ifdef CONFIG_FRAME_POINTER
-#error This compiler cannot compile correctly with frame pointers enabled
-#endif
-#endif
 
 #ifdef CONFIG_X86_LOCAL_APIC
 #include <asm/smp.h>
@@ -74,7 +69,7 @@
  * To avoid associated bogus bug reports, we flatly refuse to compile
  * with a gcc that is known to be too old from the very beginning.
  */
-#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 95)
+#if (__GNUC__ < 3) || (__GNUC__ == 3 && __GNUC_MINOR__ < 2)
 #error Sorry, your GCC is too old. It builds incorrect kernels.
 #endif
 
@@ -512,6 +507,7 @@ asmlinkage void __init start_kernel(void)
         }
 #endif
         vfs_caches_init_early();
+        cpuset_init_early();
         mem_init();
         kmem_cache_init();
         setup_per_cpu_pageset();