From 05aae9bb1b26e33e54ccc0c8755c83de4eb7ed78 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 8 Dec 2009 11:21:37 +0900 Subject: [PATCH] --- yaml --- r: 175455 b: refs/heads/master c: bc09effabf0c5c6c7021e5ef9af15a23579b32a8 h: refs/heads/master i: 175453: a38c2f6d84f8e8d0d572d905534c14340695e5ed 175451: 0980446e35da0d7c982b7ecab3404f0c28decbf7 175447: a4178b05e3a78943496bba5ca4f2efc507b729d0 175439: 9ace373da31ed31a5b82d2a97c549fcec484b74e 175423: 04ceff4d184d7d1014bdaf0c90feab4be7950e68 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/mcheck/mce.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b12b4d0616fe..4595cd153a31 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a946d8f11f0da9cfc714248036fcfd3a794d1e27 +refs/heads/master: bc09effabf0c5c6c7021e5ef9af15a23579b32a8 diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce.c b/trunk/arch/x86/kernel/cpu/mcheck/mce.c index d7ebf25d10ed..a96e5cd256a9 100644 --- a/trunk/arch/x86/kernel/cpu/mcheck/mce.c +++ b/trunk/arch/x86/kernel/cpu/mcheck/mce.c @@ -1388,13 +1388,14 @@ static void __mcheck_cpu_init_timer(void) struct timer_list *t = &__get_cpu_var(mce_timer); int *n = &__get_cpu_var(mce_next_interval); + setup_timer(t, mce_start_timer, smp_processor_id()); + if (mce_ignore_ce) return; *n = check_interval * HZ; if (!*n) return; - setup_timer(t, mce_start_timer, smp_processor_id()); t->expires = round_jiffies(jiffies + *n); add_timer_on(t, smp_processor_id()); }