drivers: use non-racy method for proc entries creation (2)

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

diff --git a/init/Kconfig b/init/Kconfig
index 51b3d14..98fa96e 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1,3 +1,11 @@
+config ARCH
+       string
+       option env="ARCH"
+
+config KERNELVERSION
+       string
+       option env="KERNELVERSION"
+

 config DEFCONFIG_LIST
        string
        depends on !UML
 config DEFCONFIG_LIST
        string
        depends on !UML


@@ -206,15 +214,6 @@ config TASK_IO_ACCOUNTING
 
          Say N if unsure.
 
 
          Say N if unsure.
 

-config USER_NS
-       bool "User Namespaces (EXPERIMENTAL)"
-       default n
-       depends on EXPERIMENTAL
-       help
-         Support user namespaces.  This allows containers, i.e.
-         vservers, to use user namespaces to provide different
-         user info for different servers.  If unsure, say N.
-

 config AUDIT
        bool "Auditing support"
        depends on NET
 config AUDIT
        bool "Auditing support"
        depends on NET


@@ -226,7 +225,7 @@ config AUDIT
 
 config AUDITSYSCALL
        bool "Enable system-call auditing support"
 
 config AUDITSYSCALL
        bool "Enable system-call auditing support"

-       depends on AUDIT && (X86 || PPC || PPC64 || S390 || IA64 || UML || SPARC64)
+       depends on AUDIT && (X86 || PPC || PPC64 || S390 || IA64 || UML || SPARC64|| SUPERH)

        default y if SECURITY_SELINUX
        help
          Enable low-overhead system-call auditing infrastructure that
        default y if SECURITY_SELINUX
        help
          Enable low-overhead system-call auditing infrastructure that


@@ -234,6 +233,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---


@@ -256,17 +259,14 @@ config IKCONFIG_PROC
 config LOG_BUF_SHIFT
        int "Kernel log buffer size (16 => 64KB, 17 => 128KB)"
        range 12 21
 config LOG_BUF_SHIFT
        int "Kernel log buffer size (16 => 64KB, 17 => 128KB)"
        range 12 21

-       default 17 if S390 || LOCKDEP
-       default 16 if X86_NUMAQ || IA64
-       default 15 if SMP
-       default 14
+       default 17

        help
          Select kernel log buffer size as a power of 2.
        help
          Select kernel log buffer size as a power of 2.

-         Defaults and Examples:
-                    17 => 128 KB for S/390
-                    16 => 64 KB for x86 NUMAQ or IA-64
-                    15 => 32 KB for SMP
-                    14 => 16 KB for uniprocessor
+         Examples:
+                    17 => 128 KB
+                    16 => 64 KB
+                    15 => 32 KB
+                    14 => 16 KB

                     13 =>  8 KB
                     12 =>  4 KB
 
                     13 =>  8 KB
                     12 =>  4 KB
 


@@ -278,9 +278,36 @@ config CGROUPS
 
          Say N if unsure.
 
 
          Say N if unsure.
 

+config CGROUP_DEBUG
+       bool "Example debug cgroup subsystem"
+       depends on CGROUPS
+       default n
+       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_DEVICE
+       bool "Device controller for cgroups"
+       depends on CGROUPS && EXPERIMENTAL
+       help
+         Provides a cgroup implementing whitelists for devices which
+         a process in the cgroup can mknod or open.
+

 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


@@ -289,30 +316,98 @@ config CPUSETS
 
          Say N if unsure.
 
 
          Say N if unsure.
 

-config FAIR_GROUP_SCHED
-       bool "Fair group CPU scheduler"
+config GROUP_SCHED
+       bool "Group CPU scheduler"

        default y
        default y

-       depends on EXPERIMENTAL

        help
          This feature lets CPU scheduler recognize task groups and control CPU
          bandwidth allocation to such task groups.
 
        help
          This feature lets CPU scheduler recognize task groups and control CPU
          bandwidth allocation to such task groups.
 

+config FAIR_GROUP_SCHED
+       bool "Group scheduling for SCHED_OTHER"
+       depends on GROUP_SCHED
+       default y
+
+config RT_GROUP_SCHED
+       bool "Group scheduling for SCHED_RR/FIFO"
+       depends on EXPERIMENTAL
+       depends on GROUP_SCHED
+       default n
+       help
+         This feature lets you explicitly allocate real CPU bandwidth
+         to users or control groups (depending on the "Basis for grouping tasks"
+         setting below. If enabled, it will also make it impossible to
+         schedule realtime tasks for non-root users until you allocate
+         realtime bandwidth for them.
+         See Documentation/sched-rt-group.txt for more information.
+

 choice
 choice

-       depends on FAIR_GROUP_SCHED
+       depends on GROUP_SCHED

        prompt "Basis for grouping tasks"
        prompt "Basis for grouping tasks"

-       default FAIR_USER_SCHED
+       default USER_SCHED

 
 

-config FAIR_USER_SCHED
+config 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.
 
        bool "user id"
        help
          This option will choose userid as the basis for grouping
          tasks, thus providing equal CPU bandwidth to each user.
 

+config 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
 
 endchoice
 

+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 RESOURCE_COUNTERS
+       bool "Resource counters"
+       help
+         This option enables controller independent resource accounting
+          infrastructure that works with cgroups
+       depends on CGROUPS
+
+config MM_OWNER
+       bool
+
+config CGROUP_MEM_RES_CTLR
+       bool "Memory Resource Controller for Control Groups"
+       depends on CGROUPS && RESOURCE_COUNTERS
+       select MM_OWNER
+       help
+         Provides a memory resource controller that manages both page cache and
+         RSS memory.
+
+         Note that setting this option increases fixed memory overhead
+         associated with each page of memory in the system by 4/8 bytes
+         and also increases cache misses because struct page on many 64bit
+         systems will not fit into a single cache line anymore.
+
+         Only enable when you're ok with these trade offs and really
+         sure you need the memory resource controller.
+
+         This config option also selects MM_OWNER config option, which
+         could in turn add some fork/exit overhead.
+

 config SYSFS_DEPRECATED
 config SYSFS_DEPRECATED

+       bool
+
+config SYSFS_DEPRECATED_V2

        bool "Create deprecated sysfs files"
        bool "Create deprecated sysfs files"

+       depends on SYSFS

        default y
        default y

+       select SYSFS_DEPRECATED

        help
          This option creates deprecated symlinks such as the
          "device"-link, the <subsystem>:<name>-link, and the
        help
          This option creates deprecated symlinks such as the
          "device"-link, the <subsystem>:<name>-link, and the


@@ -325,10 +420,16 @@ config SYSFS_DEPRECATED
 
          If enabled, this option will also move any device structures
          that belong to a class, back into the /sys/class hierarchy, in
 
          If enabled, this option will also move any device structures
          that belong to a class, back into the /sys/class hierarchy, in

-         order to support older versions of udev.
+         order to support older versions of udev and some userspace
+         programs.

 
 

-         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 with the most recent userspace
+         packages, 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)"
 
 config RELAY
        bool "Kernel->user space relay support (formerly relayfs)"


@@ -341,6 +442,49 @@ config RELAY
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+config NAMESPACES
+       bool "Namespaces support" if EMBEDDED
+       default !EMBEDDED
+       help
+         Provides the way to make tasks work with different objects using
+         the same id. For example same IPC id may refer to different objects
+         or same user id or pid may refer to different tasks when used in
+         different namespaces.
+
+config UTS_NS
+       bool "UTS namespace"
+       depends on NAMESPACES
+       help
+         In this namespace tasks see different info provided with the
+         uname() system call
+
+config IPC_NS
+       bool "IPC namespace"
+       depends on NAMESPACES && SYSVIPC
+       help
+         In this namespace tasks work with IPC ids which correspond to
+         different IPC objects in different namespaces
+
+config USER_NS
+       bool "User namespace (EXPERIMENTAL)"
+       depends on NAMESPACES && EXPERIMENTAL
+       help
+         This allows containers, i.e. vservers, to use user namespaces
+         to provide different user info for different servers.
+         If unsure, say N.
+
+config PID_NS
+       bool "PID Namespaces (EXPERIMENTAL)"
+       default n
+       depends on NAMESPACES && EXPERIMENTAL
+       help
+         Suport process id namespaces.  This allows having multiple
+         process with the same pid as long as they are in different
+         pid namespaces.  This is a building block of containers.
+
+         Unless you want to work with an experimental feature
+         say N here.
+

 config BLK_DEV_INITRD
        bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
        depends on BROKEN || !FRV
 config BLK_DEV_INITRD
        bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
        depends on BROKEN || !FRV


@@ -364,16 +508,12 @@ source "usr/Kconfig"
 endif
 
 config CC_OPTIMIZE_FOR_SIZE
 endif
 
 config CC_OPTIMIZE_FOR_SIZE

-       bool "Optimize for size (Look out for broken compilers!)"
+       bool "Optimize for size"

        default y
        default y

-       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.
 

-         WARNING: some versions of gcc may generate incorrect code with this
-         option.  If problems are observed, a gcc upgrade may be needed.
-

          If unsure, say N.
 
 config SYSCTL
          If unsure, say N.
 
 config SYSCTL


@@ -389,7 +529,7 @@ menuconfig EMBEDDED
 
 config UID16
        bool "Enable 16-bit UID system calls" if EMBEDDED
 
 config UID16
        bool "Enable 16-bit UID system calls" if EMBEDDED

-       depends on ARM || BFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && SPARC32_COMPAT) || UML || (X86_64 && IA32_EMULATION)
+       depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && COMPAT) || UML || (X86_64 && IA32_EMULATION)

        default y
        help
          This enables the legacy 16-bit UID syscall wrappers.
        default y
        help
          This enables the legacy 16-bit UID syscall wrappers.


@@ -476,6 +616,18 @@ config ELF_CORE
        help
          Enable support for generating core dumps. Disabling saves about 4k.
 
        help
          Enable support for generating core dumps. Disabling saves about 4k.
 

+config COMPAT_BRK
+       bool "Disable heap randomization"
+       default y
+       help
+         Randomizing heap placement makes heap exploits harder, but it
+         also breaks ancient binaries (including anything libc5 based).
+         This option changes the bootup default to heap randomization
+         disabled, and can be overriden runtime by setting
+         /proc/sys/kernel/randomize_va_space to 2.
+
+         On non-ancient distros (post-2000 ones) N is usually a safe choice.
+

 config BASE_FULL
        default y
        bool "Enable full-sized data structures for core" if EMBEDDED
 config BASE_FULL
        default y
        bool "Enable full-sized data structures for core" if EMBEDDED


@@ -517,7 +669,6 @@ config SIGNALFD
 config TIMERFD
        bool "Enable timerfd() system call" if EMBEDDED
        select ANON_INODES
 config TIMERFD
        bool "Enable timerfd() system call" if EMBEDDED
        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


@@ -592,16 +743,44 @@ config SLOB
        depends on EMBEDDED
        bool "SLOB (Simple Allocator)"
        help
        depends on EMBEDDED
        bool "SLOB (Simple Allocator)"
        help

-          SLOB replaces the SLAB allocator with a drastically simpler
-          allocator.  SLOB is more space efficient than SLAB but does not
-          scale well (single lock for all operations) and is also highly
-          susceptible to fragmentation. SLUB can accomplish a higher object
-          density. It is usually better to use SLUB instead of SLOB.
+          SLOB replaces the stock allocator with a drastically simpler
+          allocator. SLOB is generally more space efficient but
+          does not perform as well on large systems.

 
 endchoice
 
 
 endchoice
 

+config PROFILING
+       bool "Profiling support (EXPERIMENTAL)"
+       help
+         Say Y here to enable the extended profiling support mechanisms used
+         by profilers such as OProfile.
+
+config MARKERS
+       bool "Activate markers"
+       help
+         Place an empty function call at each marker site. Can be
+         dynamically changed for a probe function.
+
+source "arch/Kconfig"
+
+config PROC_PAGE_MONITOR
+       default y
+       depends on PROC_FS && MMU
+       bool "Enable /proc page monitoring" if EMBEDDED
+       help
+         Various /proc files exist to monitor process memory utilization:
+         /proc/pid/smaps, /proc/pid/clear_refs, /proc/pid/pagemap,
+         /proc/kpagecount, and /proc/kpageflags. Disabling these
+          interfaces will reduce the size of the kernel by approximately 4kb.
+

 endmenu                # General setup
 
 endmenu                # General setup
 

+config SLABINFO
+       bool
+       depends on PROC_FS
+       depends on SLAB || SLUB_DEBUG
+       default y
+

 config RT_MUTEXES
        boolean
        select PLIST
 config RT_MUTEXES
        boolean
        select PLIST


@@ -700,3 +879,11 @@ source "block/Kconfig"
 
 config PREEMPT_NOTIFIERS
        bool
 
 config PREEMPT_NOTIFIERS
        bool

+
+config CLASSIC_RCU
+       def_bool !PREEMPT_RCU
+       help
+         This option selects the classic RCU implementation that is
+         designed for best read-side performance on non-realtime
+         systems.  Classic RCU is the default.  Note that the
+         PREEMPT_RCU symbol is used to select/deselect this option.