summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorey Minyard <cminyard@mvista.com>2016-07-11 13:16:27 -0500
committerSteven Rostedt <rostedt@goodmis.org>2016-07-14 21:54:53 -0400
commit04230453fbc4a049739e0ec46801d0a654d17374 (patch)
tree4e3ecb8f2ff8ba55c5478c20ba83bb4cc6ecddad
parentc2ef88945f26d03d5d788c9b0539d7e8915c75a9 (diff)
downloadlinux-rt-04230453fbc4a049739e0ec46801d0a654d17374.tar.gz
x86: Fix an RT MCE crash
On some x86 systems an MCE interrupt would come in before the kernel was ready for it. Looking at the latest RT code, it has similar (but not quite the same) code, except it adds a bool that tells if MCE handling is initialized. That was required because they had switched to use swork instead of a kernel thread. Here, just checking to see if the thread is NULL is good enough to see if MCE handling is initialized. Suggested-by: Borislav Petkov <bp@alien8.de> Signed-off-by: Corey Minyard <cminyard@mvista.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index d4867bd532f3..31ec14000e4a 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -1403,7 +1403,8 @@ static int mce_notify_work_init(void)
static void mce_notify_work(void)
{
- wake_up_process(mce_notify_helper);
+ if (mce_notify_helper)
+ wake_up_process(mce_notify_helper);
}
#else
static void mce_notify_work(void)