x86: mce: Disable preemption when calling raise_local()

[karo-tx-linux.git] / arch / x86 / kernel / cpu / mcheck / mce-inject.c

diff --git a/arch/x86/kernel/cpu/mcheck/mce-inject.c b/arch/x86/kernel/cpu/mcheck/mce-inject.c
index fc4beb3935771eab1b404b3333cdb7842dac7c5c..753746f6dbd8072f186669d9dd6b43177a19308e 100644 (file)
--- a/arch/x86/kernel/cpu/mcheck/mce-inject.c
+++ b/arch/x86/kernel/cpu/mcheck/mce-inject.c
@@ -194,7 +194,11 @@ static void raise_mce(struct mce *m)
                put_online_cpus();
        } else
 #endif
+       {
+               preempt_disable();
                raise_local();
+               preempt_enable();
+       }
 }
 
 /* Error injection interface */