Commit f9c287ba authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar

timers, x86/mce: Initialize MCE restart timer as pinned

Pinned timers must carry the pinned attribute in the timer structure
itself, so convert the code to the new API.

No functional change.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Chris Mason <clm@fb.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: George Spelvin <linux@sciencehorizons.net>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Len Brown <lenb@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: rt@linutronix.de
Link: http://lkml.kernel.org/r/20160704094341.215783439@linutronix.deSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 920a4a70
...@@ -1309,7 +1309,7 @@ static void __restart_timer(struct timer_list *t, unsigned long interval) ...@@ -1309,7 +1309,7 @@ static void __restart_timer(struct timer_list *t, unsigned long interval)
if (timer_pending(t)) { if (timer_pending(t)) {
if (time_before(when, t->expires)) if (time_before(when, t->expires))
mod_timer_pinned(t, when); mod_timer(t, when);
} else { } else {
t->expires = round_jiffies(when); t->expires = round_jiffies(when);
add_timer_on(t, smp_processor_id()); add_timer_on(t, smp_processor_id());
...@@ -1735,7 +1735,7 @@ static void __mcheck_cpu_init_timer(void) ...@@ -1735,7 +1735,7 @@ static void __mcheck_cpu_init_timer(void)
struct timer_list *t = this_cpu_ptr(&mce_timer); struct timer_list *t = this_cpu_ptr(&mce_timer);
unsigned int cpu = smp_processor_id(); unsigned int cpu = smp_processor_id();
setup_timer(t, mce_timer_fn, cpu); setup_pinned_timer(t, mce_timer_fn, cpu);
mce_start_timer(cpu, t); mce_start_timer(cpu, t);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment