aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 19294b8524cb..dda77215e9e2 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -1617,8 +1617,9 @@ static int mce_resume(struct sys_device *dev)
1617static void mce_cpu_restart(void *data) 1617static void mce_cpu_restart(void *data)
1618{ 1618{
1619 del_timer_sync(&__get_cpu_var(mce_timer)); 1619 del_timer_sync(&__get_cpu_var(mce_timer));
1620 if (mce_available(&current_cpu_data)) 1620 if (!mce_available(&current_cpu_data))
1621 mce_init(); 1621 return;
1622 mce_init();
1622 mce_init_timer(); 1623 mce_init_timer();
1623} 1624}
1624 1625