1 files changed, 21 insertions, 1 deletions

diff --git a/init/Kconfig b/init/Kconfig
index ada48441aff8..c6d95f8ea055 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -396,6 +396,22 @@ config RCU_FANOUT_EXACT
 
           Say N if unsure.
 
+config RCU_FAST_NO_HZ
+        bool "Accelerate last non-dyntick-idle CPU's grace periods"
+        depends on TREE_RCU && NO_HZ && SMP
+        default n
+        help
+          This option causes RCU to attempt to accelerate grace periods
+          in order to allow the final CPU to enter dynticks-idle state
+          more quickly.  On the other hand, this option increases the
+          overhead of the dynticks-idle checking, particularly on systems
+          with large numbers of CPUs.
+
+          Say Y if energy efficiency is critically important, particularly
+                if you have relatively few CPUs.
+
+          Say N if you are unsure.
+
 config TREE_RCU_TRACE
         def_bool RCU_TRACE && ( TREE_RCU || TREE_PREEMPT_RCU )
         select DEBUG_FS
@@ -1099,7 +1115,7 @@ config MMAP_ALLOW_UNINITIALIZED
           See Documentation/nommu-mmap.txt for more information.
 
 config PROFILING
-        bool "Profiling support (EXPERIMENTAL)"
+        bool "Profiling support"
         help
           Say Y here to enable the extended profiling support mechanisms used
           by profilers such as OProfile.
@@ -1249,4 +1265,8 @@ source "block/Kconfig"
 config PREEMPT_NOTIFIERS
         bool
 
+config PADATA
+        depends on SMP
+        bool
+
 source "kernel/Kconfig.locks"