Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[linux-2.6] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index ba42f3793a84332dcbe6cdb5e4594d193997f59c..b9923b1434a2f82a698c5011fbe55191bddf8965 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -99,7 +99,7 @@ config SWAP
        default y
        help
          This option allows you to choose whether you want to have support
-         for socalled swap devices or swap files in your kernel that are
+         for so called swap devices or swap files in your kernel that are
          used to provide more virtual memory than the actual RAM present
          in your computer.  If unsure say Y.
 
@@ -228,6 +228,23 @@ config CPUSETS
 
 source "usr/Kconfig"
 
+config UID16
+       bool "Enable 16-bit UID system calls" if EMBEDDED
+       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.
+
+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 +326,12 @@ config BUG
           option for embedded systems with no facilities for reporting errors.
           Just say Y.
 
+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 +403,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 +423,13 @@ config BASE_SMALL
        default 0 if BASE_FULL
        default 1 if !BASE_FULL
 
+config SLOB
+       default !SLAB
+       bool
+
+config OBSOLETE_INTERMODULE
+       tristate
+
 menu "Loadable module support"
 
 config MODULES