[SCSI] libsas: Fix various sparse complaints

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

diff --git a/init/Kconfig b/init/Kconfig
index 8b88d0bedcbdeeb7bc08f3592bb3efdb0291c6bd..b9d11a899b8861576be26f883882c969d170701f 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -215,6 +215,18 @@ config USER_NS
          vservers, to use user namespaces to provide different
          user info for different servers.  If unsure, say N.
 
          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 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 AUDIT
        bool "Auditing support"
        depends on NET
 config AUDIT
        bool "Auditing support"
        depends on NET


@@ -301,13 +313,6 @@ config CGROUP_NS
           for instance virtual servers and checkpoint/restart
           jobs.
 
           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"
        depends on SMP && CGROUPS
 config CPUSETS
        bool "Cpuset support"
        depends on SMP && CGROUPS


@@ -349,6 +354,13 @@ config FAIR_CGROUP_SCHED
 
 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 SYSFS_DEPRECATED
        bool "Create deprecated sysfs files"
        default y
 config SYSFS_DEPRECATED
        bool "Create deprecated sysfs files"
        default y


@@ -433,7 +445,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 && SPARC32_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.


@@ -646,6 +658,12 @@ endchoice
 
 endmenu                # General setup
 
 
 endmenu                # General setup
 

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

 config RT_MUTEXES
        boolean
        select PLIST
 config RT_MUTEXES
        boolean
        select PLIST