[PATCH] MCE fixes.

Make things work if SMP kernel, and only 1 CPU.

diff --git a/arch/i386/kernel/cpu/mcheck/non-fatal.c b/arch/i386/kernel/cpu/mcheck/non-fatal.c
index f60162c85c4625cd438d693c820201d8197f5c9d..57035340e78357d4c5b0ed0e853a7d20d1f50d61 100644 (file)
--- a/arch/i386/kernel/cpu/mcheck/non-fatal.c
+++ b/arch/i386/kernel/cpu/mcheck/non-fatal.c
@@ -49,7 +49,6 @@ static void mce_checkregs (void *info)
 
 static void do_mce_timer(void *data)
 { 
-       mce_checkregs (NULL);
        smp_call_function (mce_checkregs, NULL, 1, 1);
 } 
 
@@ -57,11 +56,10 @@ static DECLARE_WORK(mce_work, do_mce_timer, NULL);
 
 static void mce_timerfunc (unsigned long data)
 {
+       mce_checkregs (NULL);
 #ifdef CONFIG_SMP
        if (num_online_cpus() > 1) 
                schedule_work (&mce_work); 
-#else
-       mce_checkregs (NULL);
 #endif
        mce_timer.expires = jiffies + MCE_RATE;
        add_timer (&mce_timer);