git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6
[sfrench/cifs-2.6.git]
/
arch
/
x86_64
/
kernel
/
mce.c
diff --git
a/arch/x86_64/kernel/mce.c
b/arch/x86_64/kernel/mce.c
index 969365c0771b242f5b64071e294bba4cd114fca9..08203b07f4bd6d6c5aa26ddc9cedda58a29fda7f 100644
(file)
--- a/
arch/x86_64/kernel/mce.c
+++ b/
arch/x86_64/kernel/mce.c
@@
-217,7
+217,7
@@
void do_machine_check(struct pt_regs * regs, long error_code)
panicm_found = 1;
}
-
tainted |= TAINT_MACHINE_CHECK
;
+
add_taint(TAINT_MACHINE_CHECK)
;
}
/* Never do anything final in the polling timer */