From 1ccb6bc6310de649facaf9fb91c48ea1010fca99 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Wed, 6 Jun 2012 11:33:21 +0200 Subject: [PATCH] --- yaml --- r: 310611 b: refs/heads/master c: 1a87fc1ec7b05b9bc60df9dc52297d4c225d7f1a h: refs/heads/master i: 310609: 72f867fc101f384c41764c9cc5484c660d0bff05 310607: 9737ba68a92b86aa6c7445f08dfdecea71598804 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/mcheck/mce.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5997123542e2..a5bcadeab044 100644 --- 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 index a97f3c4a3946..da27c5d2168a 100644 --- 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());