2.6.24

 init

diff --git a/init/Kconfig b/init/Kconfig
index d54d0ca..b9d11a8 100644
--- 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.
 
+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
@@ -234,6 +246,10 @@ config AUDITSYSCALL
      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---
@@ -270,9 +286,36 @@ config LOG_BUF_SHIFT
            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 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
@@ -281,6 +324,43 @@ config CPUSETS
 
      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 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
@@ -301,6 +381,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.
 
+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
@@ -360,7 +445,7 @@ menuconfig 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 && SPA+
RC32_COMPAT) || UML || (X86_64 && IA32_EMULATION)
    default y
    help
      This enables the legacy 16-bit UID syscall wrappers.
@@ -573,6 +658,12 @@ endchoice
 
 endmenu      # General setup
 
+config SLABINFO
+   bool
+   depends on PROC_FS
+   depends on SLAB || SLUB
+   default y
+
 config RT_MUTEXES
    boolean
    select PLIST
@@ -668,3 +759,6 @@ config STOP_MACHINE
      Need stop_machine() primitive.
 
 source "block/Kconfig"
+
+config PREEMPT_NOTIFIERS
+   bool