ide: fix ide_find_dma_mode() to print human-readable info

[safe/jmp/linux-2.6] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 0b0e29e..8b88d0b 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -7,7 +7,7 @@ config DEFCONFIG_LIST
        default "/boot/config-$UNAME_RELEASE"
        default "arch/$ARCH/defconfig"
 
        default "/boot/config-$UNAME_RELEASE"
        default "arch/$ARCH/defconfig"
 

-menu "Code maturity level options"
+menu "General setup"

 
 config EXPERIMENTAL
        bool "Prompt for development and/or incomplete code/drivers"
 
 config EXPERIMENTAL
        bool "Prompt for development and/or incomplete code/drivers"


@@ -61,9 +61,6 @@ config INIT_ENV_ARG_LIMIT
          Maximum of each of the number of arguments and environment
          variables passed to init from the kernel command line.
 
          Maximum of each of the number of arguments and environment
          variables passed to init from the kernel command line.
 

-endmenu
-
-menu "General setup"

 
 config LOCALVERSION
        string "Local version - append to kernel release"
 
 config LOCALVERSION
        string "Local version - append to kernel release"


@@ -237,6 +234,10 @@ config AUDITSYSCALL
          such as SELinux.  To use audit's filesystem watch feature, please
          ensure that INOTIFY is configured.
 
          such as SELinux.  To use audit's filesystem watch feature, please
          ensure that INOTIFY is configured.
 

+config AUDIT_TREE
+       def_bool y
+       depends on AUDITSYSCALL && INOTIFY
+

 config IKCONFIG
        tristate "Kernel .config support"
        ---help---
 config IKCONFIG
        tristate "Kernel .config support"
        ---help---


@@ -273,9 +274,43 @@ config LOG_BUF_SHIFT
                     13 =>  8 KB
                     12 =>  4 KB
 
                     13 =>  8 KB
                     12 =>  4 KB
 

+config CGROUPS
+       bool "Control Group support"
+       help
+         This option will let you use process cgroup subsystems
+         such as Cpusets
+
+         Say N if unsure.
+
+config CGROUP_DEBUG
+       bool "Example debug cgroup subsystem"
+       depends on CGROUPS
+       help
+         This option enables a simple cgroup subsystem that
+         exports useful debugging information about the cgroups
+         framework
+
+         Say N if unsure
+
+config CGROUP_NS
+        bool "Namespace cgroup subsystem"
+        depends on CGROUPS
+        help
+          Provides a simple namespace cgroup subsystem to
+          provide hierarchical naming of sets of namespaces,
+          for instance virtual servers and checkpoint/restart
+          jobs.
+
+config CGROUP_CPUACCT
+       bool "Simple CPU accounting cgroup subsystem"
+       depends on CGROUPS
+       help
+         Provides a simple Resource Controller for monitoring the
+         total CPU consumed by the tasks in a cgroup
+

 config CPUSETS
        bool "Cpuset support"
 config CPUSETS
        bool "Cpuset support"

-       depends on SMP
+       depends on SMP && CGROUPS

        help
          This option will let you create and manage CPUSETs which
          allow dynamically partitioning a system into sets of CPUs and
        help
          This option will let you create and manage CPUSETs which
          allow dynamically partitioning a system into sets of CPUs and


@@ -284,6 +319,36 @@ config CPUSETS
 
          Say N if unsure.
 
 
          Say N if unsure.
 

+config FAIR_GROUP_SCHED
+       bool "Fair group CPU scheduler"
+       default y
+       help
+         This feature lets CPU scheduler recognize task groups and control CPU
+         bandwidth allocation to such task groups.
+
+choice
+       depends on FAIR_GROUP_SCHED
+       prompt "Basis for grouping tasks"
+       default FAIR_USER_SCHED
+
+config FAIR_USER_SCHED
+       bool "user id"
+       help
+         This option will choose userid as the basis for grouping
+         tasks, thus providing equal CPU bandwidth to each user.
+
+config FAIR_CGROUP_SCHED
+       bool "Control groups"
+       depends on CGROUPS
+       help
+         This option allows you to create arbitrary task groups
+         using the "cgroup" pseudo filesystem and control
+         the cpu bandwidth allocated to each such task group.
+         Refer to Documentation/cgroups.txt for more information
+         on "cgroup" pseudo filesystem.
+
+endchoice
+

 config SYSFS_DEPRECATED
        bool "Create deprecated sysfs files"
        default y
 config SYSFS_DEPRECATED
        bool "Create deprecated sysfs files"
        default y


@@ -304,6 +369,11 @@ config SYSFS_DEPRECATED
          If you are using a distro that was released in 2006 or later,
          it should be safe to say N here.
 
          If you are using a distro that was released in 2006 or later,
          it should be safe to say N here.
 

+config PROC_PID_CPUSET
+       bool "Include legacy /proc/<pid>/cpuset file"
+       depends on CPUSETS
+       default y
+

 config RELAY
        bool "Kernel->user space relay support (formerly relayfs)"
        help
 config RELAY
        bool "Kernel->user space relay support (formerly relayfs)"
        help


@@ -340,7 +410,7 @@ endif
 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

-       depends on ARM || H8300 || EXPERIMENTAL
+       depends on ARM || H8300 || SUPERH || EXPERIMENTAL

        help
          Enabling this option will pass "-Os" instead of "-O2" to gcc
          resulting in a smaller kernel.
        help
          Enabling this option will pass "-Os" instead of "-O2" to gcc
          resulting in a smaller kernel.


@@ -468,25 +538,19 @@ config FUTEX
          run glibc-based applications correctly.
 
 config ANON_INODES
          run glibc-based applications correctly.
 
 config ANON_INODES

-       bool "Enable anonymous inode source" if EMBEDDED
-       default y
-       help
-         Anonymous inode source for pseudo-files like epoll, signalfd,
-         timerfd and eventfd.
-
-         If unsure, say Y.
+       bool

 
 config EPOLL
        bool "Enable eventpoll support" if EMBEDDED
        default y
 
 config EPOLL
        bool "Enable eventpoll support" if EMBEDDED
        default y

-       depends on ANON_INODES
+       select ANON_INODES

        help
          Disabling this option will cause the kernel to be built without
          support for epoll family of system calls.
 
 config SIGNALFD
        bool "Enable signalfd() system call" if EMBEDDED
        help
          Disabling this option will cause the kernel to be built without
          support for epoll family of system calls.
 
 config SIGNALFD
        bool "Enable signalfd() system call" if EMBEDDED

-       depends on ANON_INODES
+       select ANON_INODES

        default y
        help
          Enable the signalfd() system call that allows to receive signals
        default y
        help
          Enable the signalfd() system call that allows to receive signals


@@ -496,7 +560,8 @@ config SIGNALFD
 
 config TIMERFD
        bool "Enable timerfd() system call" if EMBEDDED
 
 config TIMERFD
        bool "Enable timerfd() system call" if EMBEDDED

-       depends on ANON_INODES
+       select ANON_INODES
+       depends on BROKEN

        default y
        help
          Enable the timerfd() system call that allows to receive timer
        default y
        help
          Enable the timerfd() system call that allows to receive timer


@@ -506,7 +571,7 @@ config TIMERFD
 
 config EVENTFD
        bool "Enable eventfd() system call" if EMBEDDED
 
 config EVENTFD
        bool "Enable eventfd() system call" if EMBEDDED

-       depends on ANON_INODES
+       select ANON_INODES

        default y
        help
          Enable the eventfd() system call that allows to receive both
        default y
        help
          Enable the eventfd() system call that allows to receive both


@@ -546,7 +611,7 @@ config SLUB_DEBUG
 
 choice
        prompt "Choose SLAB allocator"
 
 choice
        prompt "Choose SLAB allocator"

-       default SLAB
+       default SLUB

        help
           This option allows to select a slab allocator.
 
        help
           This option allows to select a slab allocator.
 


@@ -676,3 +741,6 @@ config STOP_MACHINE
          Need stop_machine() primitive.
 
 source "block/Kconfig"
          Need stop_machine() primitive.
 
 source "block/Kconfig"

+
+config PREEMPT_NOTIFIERS
+       bool