---

yaml --- r: 310611 b: refs/heads/master c: 1a87fc1 h: refs/heads/master i: 310609: 72f867f 310607: 9737ba6 v: v3
git-mirror · Jun 6, 2012 · 1ccb6bc · 1ccb6bc
1 parent c17adf1
commit 1ccb6bc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 958fb3c51295764599d6abce87e1a01ace897a3e
+refs/heads/master: 1a87fc1ec7b05b9bc60df9dc52297d4c225d7f1a
diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce.c b/trunk/arch/x86/kernel/cpu/mcheck/mce.c
@@ -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());