Skip to content

Commit f9c287b

Browse files
KAGA-KOKOIngo Molnar
authored andcommitted
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: Thomas Gleixner <[email protected]> Reviewed-by: Frederic Weisbecker <[email protected]> Cc: Arjan van de Ven <[email protected]> Cc: Chris Mason <[email protected]> Cc: Eric Dumazet <[email protected]> Cc: George Spelvin <[email protected]> Cc: Josh Triplett <[email protected]> Cc: Len Brown <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Paul E. McKenney <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Rik van Riel <[email protected]> Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 920a4a7 commit f9c287b

File tree

1 file changed

+2
-2
lines changed
  • arch/x86/kernel/cpu/mcheck

1 file changed

+2
-2
lines changed

arch/x86/kernel/cpu/mcheck/mce.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1309,7 +1309,7 @@ static void __restart_timer(struct timer_list *t, unsigned long interval)
13091309

13101310
if (timer_pending(t)) {
13111311
if (time_before(when, t->expires))
1312-
mod_timer_pinned(t, when);
1312+
mod_timer(t, when);
13131313
} else {
13141314
t->expires = round_jiffies(when);
13151315
add_timer_on(t, smp_processor_id());
@@ -1735,7 +1735,7 @@ static void __mcheck_cpu_init_timer(void)
17351735
struct timer_list *t = this_cpu_ptr(&mce_timer);
17361736
unsigned int cpu = smp_processor_id();
17371737

1738-
setup_timer(t, mce_timer_fn, cpu);
1738+
setup_pinned_timer(t, mce_timer_fn, cpu);
17391739
mce_start_timer(cpu, t);
17401740
}
17411741

0 commit comments

Comments
 (0)