x86: mce: Disable preemption when calling raise_local()

raise_mce() has a code path which does not disable preemption when the raise_local() is called. The per cpu variable access in raise_local() depends on preemption being disabled to be functional. So that code path was either never tested or never tested with CONFIG_DEBUG_PREEMPT enabled. Add the missing preempt_disable/enable() pair around the call. Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: Chen Gong <[email protected]> Signed-off-by: Tony Luck <[email protected]>
quicksilveramalgum · Aug 3, 2012 · ea22571 · ea22571
1 parent 0d7614f
commit ea22571
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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 */