[IA64] make uncached allocator more node aware

[karo-tx-linux.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index e0358f3946a11e883a1b5bb49ed738d5470fb872..a099fc6526d9277cf140c70c04399022ce1aaf43 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.


@@ -150,6 +158,30 @@ config BSD_PROCESS_ACCT_V3
          for processing it. A preliminary version of these tools is available
          at <http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/>.
 
          for processing it. A preliminary version of these tools is available
          at <http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/>.
 

+config TASKSTATS
+       bool "Export task/process statistics through netlink (EXPERIMENTAL)"
+       depends on NET
+       default n
+       help
+         Export selected statistics for tasks/processes through the
+         generic netlink interface. Unlike BSD process accounting, the
+         statistics are available during the lifetime of tasks/processes as
+         responses to commands. Like BSD accounting, they are sent to user
+         space on task exit.
+
+         Say N if unsure.
+
+config TASK_DELAY_ACCT
+       bool "Enable per-task delay accounting (EXPERIMENTAL)"
+       depends on TASKSTATS
+       help
+         Collect information on time spent by a task waiting for system
+         resources like cpu, synchronous block I/O completion and swapping
+         in pages. Such statistics can help in setting a task's priorities
+         relative to other tasks for cpu, io, rss limits etc.
+
+         Say N if unsure.
+

 config SYSCTL
        bool "Sysctl support" if EMBEDDED
        default y
 config SYSCTL
        bool "Sysctl support" if EMBEDDED
        default y


@@ -236,16 +268,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


@@ -341,9 +363,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


@@ -376,6 +403,15 @@ 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 VM_EVENT_COUNTERS
+       default y
+       bool "Enable VM event counters for /proc/vmstat" if EMBEDDED
+       help
+         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
 
 config TINY_SHMEM
 endmenu                # General setup
 
 config TINY_SHMEM