projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
arch
/
x86
/
kernel
/
signal.c
diff --git
a/arch/x86/kernel/signal.c
b/arch/x86/kernel/signal.c
index 81e58238c4ce642ed54ea3ce63c265427e1d6984..6a44a76055adcb781572978d1e332a9923f7e2d6 100644
(file)
--- a/
arch/x86/kernel/signal.c
+++ b/
arch/x86/kernel/signal.c
@@
-856,7
+856,7
@@
static void do_signal(struct pt_regs *regs)
void
do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags)
{
-#ifdef CONFIG_X86_
NEW_
MCE
+#ifdef CONFIG_X86_MCE
/* notify userspace of pending MCEs */
if (thread_info_flags & _TIF_MCE_NOTIFY)
mce_notify_process();