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

[linux-2.6-microblaze.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index e2894b2..3e0b662 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1353,20 +1353,6 @@ config RCU_CPU_STALL_TIMEOUT
          RCU grace period persists, additional CPU stall warnings are
          printed at more widely spaced intervals.
 
-config RCU_CPU_STALL_INFO
-       bool "Print additional diagnostics on RCU CPU stall"
-       depends on (TREE_RCU || PREEMPT_RCU) && DEBUG_KERNEL
-       default y
-       help
-         For each stalled CPU that is aware of the current RCU grace
-         period, print out additional per-CPU diagnostic information
-         regarding scheduling-clock ticks, idle state, and,
-         for RCU_FAST_NO_HZ kernels, idle-entry state.
-
-         Say N if you are unsure.
-
-         Say Y if you want to enable such diagnostics.
-
 config RCU_TRACE
        bool "Enable tracing for RCU"
        depends on DEBUG_KERNEL
@@ -1379,7 +1365,7 @@ config RCU_TRACE
          Say N if you are unsure.
 
 config RCU_EQS_DEBUG
-       bool "Use this when adding any sort of NO_HZ support to your arch"
+       bool "Provide debugging asserts for adding NO_HZ support to an arch"
        depends on DEBUG_KERNEL
        help
          This option provides consistency checks in RCU's handling of