Merge branch 'master' of /home/sam/kernel/linux-2.6/

[linux-2.6-omap-h63xx.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index f1bc2f0e94e5996eeaf520132823f7e171d3bb86..a5b073a103e7cf9cd5a3438765a97e6468c23c6f 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1,3 +1,11 @@
+config DEFCONFIG_LIST
+       string
+       option defconfig_list
+       default "/lib/modules/$UNAME_RELEASE/.config"
+       default "/etc/kernel-config"
+       default "/boot/config-$UNAME_RELEASE"
+       default "arch/$ARCH/defconfig"
+

 menu "Code maturity level options"
 
 config EXPERIMENTAL
 menu "Code maturity level options"
 
 config EXPERIMENTAL


@@ -46,8 +54,8 @@ config LOCK_KERNEL
 
 config INIT_ENV_ARG_LIMIT
        int
 
 config INIT_ENV_ARG_LIMIT
        int

-       default 32 if !USERMODE
-       default 128 if USERMODE
+       default 32 if !UML
+       default 128 if UML

        help
          Maximum of each of the number of arguments and environment
          variables passed to init from the kernel command line.
        help
          Maximum of each of the number of arguments and environment
          variables passed to init from the kernel command line.


@@ -151,7 +159,8 @@ config BSD_PROCESS_ACCT_V3
          at <http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/>.
 
 config SYSCTL
          at <http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/>.
 
 config SYSCTL

-       bool "Sysctl support"
+       bool "Sysctl support" if EMBEDDED
+       default y

        ---help---
          The sysctl interface provides a means of dynamically changing
          certain kernel parameters and variables on the fly without requiring
        ---help---
          The sysctl interface provides a means of dynamically changing
          certain kernel parameters and variables on the fly without requiring


@@ -182,7 +191,8 @@ config AUDITSYSCALL
        help
          Enable low-overhead system-call auditing infrastructure that
          can be used independently or with another kernel subsystem,
        help
          Enable low-overhead system-call auditing infrastructure that
          can be used independently or with another kernel subsystem,

-         such as SELinux.
+         such as SELinux.  To use audit's filesystem watch feature, please
+         ensure that INOTIFY is configured.

 
 config IKCONFIG
        bool "Kernel .config support"
 
 config IKCONFIG
        bool "Kernel .config support"


@@ -234,16 +244,6 @@ config UID16
        help
          This enables the legacy 16-bit UID syscall wrappers.
 
        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
 config CC_OPTIMIZE_FOR_SIZE
        bool "Optimize for size (Look out for broken compilers!)"
        default y


@@ -339,9 +339,14 @@ config BASE_FULL
          kernel data structures. This saves memory on small machines,
          but may reduce performance.
 
          kernel data structures. This saves memory on small machines,
          but may reduce performance.
 

+config RT_MUTEXES
+       boolean
+       select PLIST
+

 config FUTEX
        bool "Enable futex support" if EMBEDDED
        default y
 config FUTEX
        bool "Enable futex support" if EMBEDDED
        default y

+       select RT_MUTEXES

        help
          Disabling this option will cause the kernel to be built without
          support for "fast userspace mutexes".  The resulting kernel may not
        help
          Disabling this option will cause the kernel to be built without
          support for "fast userspace mutexes".  The resulting kernel may not


@@ -374,14 +379,14 @@ config SLAB
          SLOB is more space efficient but does not scale well and is
          more susceptible to fragmentation.
 
          SLOB is more space efficient but does not scale well and is
          more susceptible to fragmentation.
 

-config DOUBLEFAULT
+config VM_EVENT_COUNTERS

        default y
        default y

-       bool "Enable doublefault exception handler" if EMBEDDED && X86_32
+       bool "Enable VM event counters for /proc/vmstat" if EMBEDDED

        help
        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.
+         VM event counters are only needed to for event counts to be
+         shown. They have no function for the kernel itself. This
+         option allows the disabling of the VM event counters.
+         /proc/vmstat will only show page counts.

 
 endmenu                # General setup
 
 
 endmenu                # General setup
 


@@ -398,9 +403,6 @@ config SLOB
        default !SLAB
        bool
 
        default !SLAB
        bool
 

-config OBSOLETE_INTERMODULE
-       tristate
-

 menu "Loadable module support"
 
 config MODULES
 menu "Loadable module support"
 
 config MODULES