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
x86, mce: unify mce.h
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
cpu
/
mcheck
/
p6.c
diff --git
a/arch/x86/kernel/cpu/mcheck/p6.c
b/arch/x86/kernel/cpu/mcheck/p6.c
index 43c24e667457f2b8598da9984bb59cde18aa00c4..01e4f817818362b90b0abae267150ccc3839d5b6 100644
(file)
--- a/
arch/x86/kernel/cpu/mcheck/p6.c
+++ b/
arch/x86/kernel/cpu/mcheck/p6.c
@@
-10,10
+10,9
@@
#include <asm/processor.h>
#include <asm/system.h>
+#include <asm/mce.h>
#include <asm/msr.h>
-#include "mce.h"
-
/* Machine Check Handler For PII/PIII */
static void intel_machine_check(struct pt_regs *regs, long error_code)
{