1 files changed, 24 insertions, 7 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 3da09dab537..56240e724d9 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
@@ -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
@@ -814,7 +831,7 @@ 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 +854,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