Merge branch 'perfcounters-rename-for-linus' of git://git.kernel.org/pub/scm/linux...

[profile/ivi/kernel-x86-ivi.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 706728b..0aa6579 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -331,7 +331,8 @@ config TREE_PREEMPT_RCU
          This option selects the RCU implementation that is
          designed for very large SMP systems with hundreds or
          thousands of CPUs, but for which real-time response
-         is also required.
+         is also required.  It also scales down nicely to
+         smaller systems.
 
 endchoice
 
@@ -1071,13 +1072,6 @@ config PROFILING
 config TRACEPOINTS
        bool
 
-config MARKERS
-       bool "Activate markers"
-       select TRACEPOINTS
-       help
-         Place an empty function call at each marker site. Can be
-         dynamically changed for a probe function.
-
 source "arch/Kconfig"
 
 config SLOW_WORK