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

[linux.git] / arch / x86 / kernel / cpu / mcheck / mce.c

diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 58af6300992d586df1ca34d2299bdea8f727d036..79d8ec849468e70ab42d7f5bfc19497578208a79 100644 (file)
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -1309,7 +1309,7 @@ static void __restart_timer(struct timer_list *t, unsigned long interval)
 
        if (timer_pending(t)) {
                if (time_before(when, t->expires))
-                       mod_timer_pinned(t, when);
+                       mod_timer(t, when);
        } else {
                t->expires = round_jiffies(when);
                add_timer_on(t, smp_processor_id());
@@ -1735,7 +1735,7 @@ static void __mcheck_cpu_init_timer(void)
        struct timer_list *t = this_cpu_ptr(&mce_timer);
        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);
 }