Merge branch 'linus' into core/softlockup

1 files changed, 9 insertions, 13 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 883ecea22f37..4934eaa21e1e 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -608,6 +608,15 @@ config DEBUG_NOTIFIERS
           This is a relatively cheap check but if you care about maximum
           performance, say N.
 
+#
+# Select this config option from the architecture Kconfig, if it
+# it is preferred to always offer frame pointers as a config
+# option on the architecture (regardless of KERNEL_DEBUG):
+#
+config ARCH_WANT_FRAME_POINTERS
+        bool
+        help
+
 config FRAME_POINTER
         bool "Compile the kernel with frame pointers"
         depends on DEBUG_KERNEL && \
@@ -671,19 +680,6 @@ config RCU_TORTURE_TEST_RUNNABLE
 
 config RCU_CPU_STALL_DETECTOR
         bool "Check for stalled CPUs delaying RCU grace periods"
-        depends on CLASSIC_RCU
-        default n
-        help
-          This option causes RCU to printk information on which
-          CPUs are delaying the current grace period, but only when
-          the grace period extends for excessive time periods.
-
-          Say Y if you want RCU to perform such checks.
-
-          Say N if you are unsure.
-
-config RCU_CPU_STALL_DETECTOR
-        bool "Check for stalled CPUs delaying RCU grace periods"
         depends on CLASSIC_RCU || TREE_RCU
         default n
         help