git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
cpu
/
mcheck
/
p6.c
diff --git
a/arch/i386/kernel/cpu/mcheck/p6.c
b/arch/i386/kernel/cpu/mcheck/p6.c
index
d63e957
..
46640f8
100644
(file)
--- a/
arch/i386/kernel/cpu/mcheck/p6.c
+++ b/
arch/i386/kernel/cpu/mcheck/p6.c
@@
-17,7
+17,7
@@
#include "mce.h"
/* Machine Check Handler For PII/PIII */
#include "mce.h"
/* Machine Check Handler For PII/PIII */
-static
asmlinkage
void intel_machine_check(struct pt_regs * regs, long error_code)
+static
fastcall
void intel_machine_check(struct pt_regs * regs, long error_code)
{
int recover=1;
u32 alow, ahigh, high, low;
{
int recover=1;
u32 alow, ahigh, high, low;
@@
-72,6
+72,7
@@
static asmlinkage void intel_machine_check(struct pt_regs * regs, long error_cod
wrmsr (msr, 0UL, 0UL);
/* Serialize */
wmb();
wrmsr (msr, 0UL, 0UL);
/* Serialize */
wmb();
+ add_taint(TAINT_MACHINE_CHECK);
}
}
mcgstl &= ~(1<<2);
}
}
mcgstl &= ~(1<<2);