Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer updates from Thomas Gleixner:
 "The clocksource driver is pure hardware enablement and the skew option
  is default off, well tested and non dangerous."

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tick: Move skew_tick option into the HIGH_RES_TIMER section
  clocksource: em_sti: Add DT support
  clocksource: em_sti: Emma Mobile STI driver
  clockevents: Make clockevents_config() a global symbol
  tick: Add tick skew boot option

1 files changed, 9 insertions, 0 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index c45513d806ab..a92c5ebf373e 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2543,6 +2543,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
         sched_debug     [KNL] Enables verbose scheduler debug messages.
 
+        skew_tick=      [KNL] Offset the periodic timer tick per cpu to mitigate
+                        xtime_lock contention on larger systems, and/or RCU lock
+                        contention on all systems with CONFIG_MAXSMP set.
+                        Format: { "0" | "1" }
+                        0 -- disable. (may be 1 via CONFIG_CMDLINE="skew_tick=1"
+                        1 -- enable.
+                        Note: increases power consumption, thus should only be
+                        enabled if running jitter sensitive (HPC/RT) workloads.
+
         security=       [SECURITY] Choose a security module to enable at boot.
                         If this boot parameter is not specified, only the first
                         security module asking for security registration will be