Commit db8b0101 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] fix mce setup for SMP with cpus=1

parent 6596fe31
...@@ -49,7 +49,6 @@ static void mce_checkregs (void *info) ...@@ -49,7 +49,6 @@ static void mce_checkregs (void *info)
static void do_mce_timer(void *data) static void do_mce_timer(void *data)
{ {
mce_checkregs (NULL);
smp_call_function (mce_checkregs, NULL, 1, 1); smp_call_function (mce_checkregs, NULL, 1, 1);
} }
...@@ -57,11 +56,10 @@ static DECLARE_WORK(mce_work, do_mce_timer, NULL); ...@@ -57,11 +56,10 @@ static DECLARE_WORK(mce_work, do_mce_timer, NULL);
static void mce_timerfunc (unsigned long data) static void mce_timerfunc (unsigned long data)
{ {
mce_checkregs (NULL);
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
if (num_online_cpus() > 1) if (num_online_cpus() > 1)
schedule_work (&mce_work); schedule_work (&mce_work);
#else
mce_checkregs (NULL);
#endif #endif
mce_timer.expires = jiffies + MCE_RATE; mce_timer.expires = jiffies + MCE_RATE;
add_timer (&mce_timer); add_timer (&mce_timer);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment