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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
cpu
/
mcheck
/
k7.c
diff --git
a/arch/i386/kernel/cpu/mcheck/k7.c
b/arch/i386/kernel/cpu/mcheck/k7.c
index
304bf42
..
b0862af
100644
(file)
--- a/
arch/i386/kernel/cpu/mcheck/k7.c
+++ b/
arch/i386/kernel/cpu/mcheck/k7.c
@@
-6,8
+6,6
@@
#include <linux/init.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/types.h>
#include <linux/kernel.h>
-#include <linux/config.h>
-#include <linux/irq.h>
#include <linux/interrupt.h>
#include <linux/smp.h>
#include <linux/interrupt.h>
#include <linux/smp.h>
@@
-18,7
+16,7
@@
#include "mce.h"
/* Machine Check Handler For AMD Athlon/Duron */
#include "mce.h"
/* Machine Check Handler For AMD Athlon/Duron */
-static
asmlinkage
void k7_machine_check(struct pt_regs * regs, long error_code)
+static
fastcall
void k7_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;
@@
-54,6
+52,7
@@
static asmlinkage void k7_machine_check(struct pt_regs * regs, long error_code)
wrmsr (MSR_IA32_MC0_STATUS+i*4, 0UL, 0UL);
/* Serialize */
wmb();
wrmsr (MSR_IA32_MC0_STATUS+i*4, 0UL, 0UL);
/* Serialize */
wmb();
+ add_taint(TAINT_MACHINE_CHECK);
}
}
}
}
@@
-68,7
+67,7
@@
static asmlinkage void k7_machine_check(struct pt_regs * regs, long error_code)
/* AMD K7 machine check is Intel like */
/* AMD K7 machine check is Intel like */
-void
__init
amd_mcheck_init(struct cpuinfo_x86 *c)
+void amd_mcheck_init(struct cpuinfo_x86 *c)
{
u32 l, h;
int i;
{
u32 l, h;
int i;