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

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

diff --combined Documentation/kernel-parameters.txt
index c45513d806abc48d3e11fa756e4f11138fb179ce,ea38cd1f0abaaf653934e5ccc1f312fe11534361..a92c5ebf373e2bf4bea68072b58fbc0471ad9c13
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -335,12 -335,6 +335,12 @@@ bytes respectively. Such letter suffixe
                                          requirements as needed. This option
                                          does not override iommu=pt
  
 +      amd_iommu_dump= [HW,X86-64]
 +                      Enable AMD IOMMU driver option to dump the ACPI table
 +                      for AMD IOMMU. With this option enabled, AMD IOMMU
 +                      driver will print ACPI tables for AMD IOMMU during
 +                      IOMMU initialization.
 +
        amijoy.map=     [HW,JOY] Amiga joystick support
                        Map of devices attached to JOY0DAT and JOY1DAT
                        Format: <a>,<b>
@@@ -403,6 -397,8 +403,6 @@@
        atkbd.softrepeat= [HW]
                        Use software keyboard repeat
  
 -      autotest        [IA-64]
 -
        baycom_epp=     [HW,AX25]
                        Format: <io>,<mode>
  
@@@ -512,11 -508,6 +512,11 @@@
                        Also note the kernel might malfunction if you disable
                        some critical bits.
  
 +      cma=nn[MG]      [ARM,KNL]
 +                      Sets the size of kernel global memory area for contiguous
 +                      memory allocations. For more information, see
 +                      include/linux/dma-contiguous.h
 +
        cmo_free_hint=  [PPC] Format: { yes | no }
                        Specify whether pages are marked as being inactive
                        when they are freed.  This is used in CMO environments
@@@ -524,10 -515,6 +524,10 @@@
                        a hypervisor.
                        Default: yes
  
 +      coherent_pool=nn[KMG]   [ARM,KNL]
 +                      Sets the size of memory pool for coherent, atomic dma
 +                      allocations if Contiguous Memory Allocator (CMA) is used.
 +
        code_bytes      [X86] How many bytes of object code to print
                        in an oops report.
                        Range: 0 - 8192
@@@ -1457,6 -1444,8 +1457,6 @@@
                        devices can be requested on-demand with the
                        /dev/loop-control interface.
  
 -      mcatest=        [IA-64]
 -
        mce             [X86-32] Machine Check Exception
  
        mce=option      [X86-64] See Documentation/x86/x86_64/boot-options.txt
@@@ -2543,6 -2532,15 +2543,15 @@@
  
        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