x86: mce: Add the dropped timer interval init back
authorThomas Gleixner <tglx@linutronix.de>
Wed, 6 Jun 2012 09:33:21 +0000 (11:33 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 6 Jun 2012 09:33:21 +0000 (11:33 +0200)
commit 82f7af09 ("x86/mce: Cleanup timer mess) dropped the
initialization of the per cpu timer interval. Duh :(

Restore the previous behaviour.

Reported-by: Chen Gong <gong.chen@linux.intel.com>
Cc: bp@amd64.org
Cc: tony.luck@intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/kernel/cpu/mcheck/mce.c

index a97f3c4a3946b7e7d3b8be67129a33166ab2b61c..da27c5d2168a74c29e3d1da16d108ef7017113c8 100644 (file)
@@ -1557,7 +1557,7 @@ static void __mcheck_cpu_init_vendor(struct cpuinfo_x86 *c)
 static void __mcheck_cpu_init_timer(void)
 {
        struct timer_list *t = &__get_cpu_var(mce_timer);
-       unsigned long iv = __this_cpu_read(mce_next_interval);
+       unsigned long iv = check_interval * HZ;
 
        setup_timer(t, mce_timer_fn, smp_processor_id());