Commit ea22571c authored Jul 19, 2012 by Thomas Gleixner Committed by Tony Luck Aug 03, 2012

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 <tglx@linutronix.de>
Signed-off-by: Chen Gong <gong.chen@linux.intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

parent 0d7614f0

arch/x86/kernel/cpu/mcheck/mce-inject.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -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 */