Merge branch 'timers/core' into perf/timer, to apply dependent patch

An upcoming patch will depend on tai_ns() and NMI-safe ktime_get_raw_fast(),
so merge timers/core here in a separate topic branch until it's all cooked
and timers/core is merged upstream.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 13 insertions, 0 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index c5cefb3c009c..36b6fa88ce5b 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -865,6 +865,19 @@ config SCHED_STACK_END_CHECK
           data corruption or a sporadic crash at a later stage once the region
           is examined. The runtime overhead introduced is minimal.
 
+config DEBUG_TIMEKEEPING
+        bool "Enable extra timekeeping sanity checking"
+        help
+          This option will enable additional timekeeping sanity checks
+          which may be helpful when diagnosing issues where timekeeping
+          problems are suspected.
+
+          This may include checks in the timekeeping hotpaths, so this
+          option may have a (very small) performance impact to some
+          workloads.
+
+          If unsure, say N.
+
 config TIMER_STATS
         bool "Collect kernel timers statistics"
         depends on DEBUG_KERNEL && PROC_FS