1 files changed, 41 insertions, 19 deletions

diff --git a/init/Kconfig b/init/Kconfig
index be788c0957d4..4986ecc49e65 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -69,11 +69,6 @@ config BROKEN_ON_SMP
         depends on BROKEN || !SMP
         default y
 
-config LOCK_KERNEL
-        bool
-        depends on (SMP || PREEMPT) && BKL
-        default y
-
 config INIT_ENV_ARG_LIMIT
         int
         default 32 if !UML
@@ -287,6 +282,18 @@ config BSD_PROCESS_ACCT_V3
           for processing it. A preliminary version of these tools is available
           at <http://www.gnu.org/software/acct/>.
 
+config FHANDLE
+        bool "open by fhandle syscalls"
+        select EXPORTFS
+        help
+          If you say Y here, a user level program will be able to map
+          file names to handle and then later use the handle for
+          different file system operations. This is useful in implementing
+          userspace file servers, which now track files using handles instead
+          of names. The handle would remain the same even if file names
+          get renamed. Enables open_by_handle_at(2) and name_to_handle_at(2)
+          syscalls.
+
 config TASKSTATS
         bool "Export task/process statistics through netlink (EXPERIMENTAL)"
         depends on NET
@@ -478,7 +485,7 @@ config TREE_RCU_TRACE
 
 config RCU_BOOST
         bool "Enable RCU priority boosting"
-        depends on RT_MUTEXES && TINY_PREEMPT_RCU
+        depends on RT_MUTEXES && PREEMPT_RCU
         default n
         help
           This option boosts the priority of preempted RCU readers that
@@ -683,6 +690,16 @@ config CGROUP_MEM_RES_CTLR_SWAP_ENABLED
           select this option (if, for some reason, they need to disable it
           then noswapaccount does the trick).
 
+config CGROUP_PERF
+        bool "Enable perf_event per-cpu per-container group (cgroup) monitoring"
+        depends on PERF_EVENTS && CGROUPS
+        help
+          This option extends the per-cpu mode to restrict monitoring to
+          threads which belong to the cgroup specified and run on the
+          designated cpu.
+
+          Say N if unsure.
+
 menuconfig CGROUP_SCHED
         bool "Group CPU scheduler"
         depends on EXPERIMENTAL
@@ -728,9 +745,9 @@ config BLK_CGROUP
 
         This option only enables generic Block IO controller infrastructure.
         One needs to also enable actual IO controlling logic/policy. For
-        enabling proportional weight division of disk bandwidth in CFQ seti
-        CONFIG_CFQ_GROUP_IOSCHED=y and for enabling throttling policy set
-        CONFIG_BLK_THROTTLE=y.
+        enabling proportional weight division of disk bandwidth in CFQ, set
+        CONFIG_CFQ_GROUP_IOSCHED=y; for enabling throttling policy, set
+        CONFIG_BLK_DEV_THROTTLING=y.
 
         See Documentation/cgroups/blkio-controller.txt for more information.
 
@@ -810,11 +827,16 @@ config SCHED_AUTOGROUP
           desktop applications.  Task group autogeneration is currently based
           upon task session.
 
+config SCHED_TTWU_QUEUE
+        bool
+        depends on !SPARC32
+        default y
+
 config MM_OWNER
         bool
 
 config SYSFS_DEPRECATED
-        bool "enable deprecated sysfs features to support old userspace tools"
+        bool "Enable deprecated sysfs features to support old userspace tools"
         depends on SYSFS
         default n
         help
@@ -837,7 +859,7 @@ config SYSFS_DEPRECATED
           need to say Y here.
 
 config SYSFS_DEPRECATED_V2
-        bool "enabled deprecated sysfs features by default"
+        bool "Enable deprecated sysfs features by default"
         default n
         depends on SYSFS
         depends on SYSFS_DEPRECATED
@@ -907,14 +929,6 @@ menuconfig EXPERT
           environments which can tolerate a "non-standard" kernel.
           Only use this if you really know what you are doing.
 
-config EMBEDDED
-        bool "Embedded system"
-        select EXPERT
-        help
-          This option should be enabled if compiling the kernel for
-          an embedded system so certain expert options are available
-          for configuration.
-
 config UID16
         bool "Enable 16-bit UID system calls" if EXPERT
         depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && COMPAT) || UML || (X86_64 && IA32_EMULATION)
@@ -1087,6 +1101,14 @@ config AIO
           by some high performance threaded applications. Disabling
           this option saves about 7k.
 
+config EMBEDDED
+        bool "Embedded system"
+        select EXPERT
+        help
+          This option should be enabled if compiling the kernel for
+          an embedded system so certain expert options are available
+          for configuration.
+
 config HAVE_PERF_EVENTS
         bool
         help