Merge commit '900cfa46191a7d87cf1891924cb90499287fd235'; branches 'timers/nohz',...

diff --combined Documentation/kernel-parameters.txt
index b52f47d588b40fea417bf4bca4ffdbfef4d02152,e07c432c731ff9a516fe8b23228af0fe6fa1d29a,e07c432c731ff9a516fe8b23228af0fe6fa1d29a,356b64ba706a8945b64b64bc5f152bcace32598e,e07c432c731ff9a516fe8b23228af0fe6fa1d29a..f22386321e7adfb12d46dd616391345d9a654fff
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
--- 3/Documentation/kernel-parameters.txt
--- 4/Documentation/kernel-parameters.txt
--- 5/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@@@@ -295,7 -295,7 -295,7 -295,7 -295,7 +295,7 @@@@@@ and is between 256 and 4096 characters
                        when initialising the APIC and IO-APIC components.
     
        apm=            [APM] Advanced Power Management
 ----                   See header of arch/i386/kernel/apm.c.
 ++++                   See header of arch/x86/kernel/apm_32.c.
     
        arcrimi=        [HW,NET] ARCnet - "RIM I" (entirely mem-mapped) cards
                        Format: <io>,<irq>,<nodeID>
@@@@@@ -638,7 -638,7 -638,7 -638,7 -638,7 +638,7 @@@@@@
     
        elanfreq=       [X86-32]
                        See comment before function elanfreq_setup() in
 ----                   arch/i386/kernel/cpu/cpufreq/elanfreq.c.
 ++++                   arch/x86/kernel/cpu/cpufreq/elanfreq.c.
     
        elevator=       [IOSCHED]
                        Format: {"anticipatory" | "cfq" | "deadline" | "noop"}
@@@@@@ -1571,6 -1571,6 -1571,6 -1571,10 -1571,6 +1571,10 @@@@@@
                        Format: { parport<nr> | timid | 0 }
                        See also Documentation/parport.txt.
     
+++ +   pmtmr=          [X86] Manual setup of pmtmr I/O Port. 
+++ +                   Override pmtimer IOPort with a hex value.
+++ +                   e.g. pmtmr=0x508
+++ +
        pnpacpi=        [ACPI]
                        { off }
     
@@@@@@ -1679,10 -1679,6 -1679,6 -1683,6 -1679,6 +1683,10 @@@@@@
                        Format: <reboot_mode>[,<reboot_mode2>[,...]]
                        See arch/*/kernel/reboot.c or arch/*/kernel/process.c                   
     
 ++++   relax_domain_level=
 ++++                   [KNL, SMP] Set scheduler's default relax_domain_level.
 ++++                   See Documentation/cpusets.txt.
 ++++
        reserve=        [KNL,BUGS] Force the kernel to ignore some iomem area
     
        reservetop=     [X86-32]

diff --combined kernel/hrtimer.c
index ab80515008f4740fd980b1089d922811978ccff4,635739d219daa4a74d2249e11cc142c559295578,421be5fe5cc78f5d2be0eabd3ba2367fe1b15b3e,421be5fe5cc78f5d2be0eabd3ba2367fe1b15b3e,421be5fe5cc78f5d2be0eabd3ba2367fe1b15b3e..ffca825d24bc1db3f3810db01285bf5f08f50786
--- 1/kernel/hrtimer.c
--- 2/kernel/hrtimer.c
--- 3/kernel/hrtimer.c
--- 4/kernel/hrtimer.c
--- 5/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@@@@@ -300,11 -300,10 -300,11 -300,11 -300,11 +300,10 @@@@@@ EXPORT_SYMBOL_GPL(ktime_sub_ns)
      */
     u64 ktime_divns(const ktime_t kt, s64 div)
     {
- ---   u64 dclc, inc, dns;
+ +++   u64 dclc;
        int sft = 0;
     
- ---   dclc = dns = ktime_to_ns(kt);
- ---   inc = div;
+ +++   dclc = ktime_to_ns(kt);
        /* Make sure the divisor is less than 2^32: */
        while (div >> 32) {
                sft++;
@@@@@@ -632,8 -631,6 -632,8 -632,8 -632,8 +631,6 @@@@@@ void clock_was_set(void
      */
     void hres_timers_resume(void)
     {
- ---   WARN_ON_ONCE(num_online_cpus() > 1);
- ---
        /* Retrigger the CPU local events: */
        retrigger_next_event(NULL);
     }
@@@@@@ -1003,18 -1000,10 -1003,10 -1003,10 -1003,10 +1000,18 @@@@@@ hrtimer_start(struct hrtimer *timer, kt
         */
        raise = timer->state == HRTIMER_STATE_PENDING;
     
 ++++   /*
 ++++    * We use preempt_disable to prevent this task from migrating after
 ++++    * setting up the softirq and raising it. Otherwise, if me migrate
 ++++    * we will raise the softirq on the wrong CPU.
 ++++    */
 ++++   preempt_disable();
 ++++
        unlock_hrtimer_base(timer, &flags);
     
        if (raise)
                hrtimer_raise_softirq();
 ++++   preempt_enable();
     
        return ret;
     }