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

[sfrench/cifs-2.6.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 a9e898b71208f15793f4c9ac171be011301e2d4e..868e412b4f0c351795cfa93181e185c210a3d796 100644 (file)
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -1367,13 +1367,12 @@ static void __start_timer(struct timer_list *t, unsigned long interval)
        local_irq_restore(flags);
 }
 
-static void mce_timer_fn(unsigned long data)
+static void mce_timer_fn(struct timer_list *t)
 {
-       struct timer_list *t = this_cpu_ptr(&mce_timer);
-       int cpu = smp_processor_id();
+       struct timer_list *cpu_t = this_cpu_ptr(&mce_timer);
        unsigned long iv;
 
-       WARN_ON(cpu != data);
+       WARN_ON(cpu_t != t);
 
        iv = __this_cpu_read(mce_next_interval);
 
@@ -1763,17 +1762,15 @@ static void mce_start_timer(struct timer_list *t)
 static void __mcheck_cpu_setup_timer(void)
 {
        struct timer_list *t = this_cpu_ptr(&mce_timer);
-       unsigned int cpu = smp_processor_id();
 
-       setup_pinned_timer(t, mce_timer_fn, cpu);
+       timer_setup(t, mce_timer_fn, TIMER_PINNED);
 }
 
 static void __mcheck_cpu_init_timer(void)
 {
        struct timer_list *t = this_cpu_ptr(&mce_timer);
-       unsigned int cpu = smp_processor_id();
 
-       setup_pinned_timer(t, mce_timer_fn, cpu);
+       timer_setup(t, mce_timer_fn, TIMER_PINNED);
        mce_start_timer(t);
 }