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 git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[sfrench/cifs-2.6.git]
/
arch
/
i386
/
kernel
/
cpu
/
mcheck
/
mce.c
diff --git
a/arch/i386/kernel/cpu/mcheck/mce.c
b/arch/i386/kernel/cpu/mcheck/mce.c
index d555bec0db99d0c0cfa1f3d910a3a17403e7709d..56cd485b127ce59b2da500e9f176b83bb755b7b7 100644
(file)
--- a/
arch/i386/kernel/cpu/mcheck/mce.c
+++ b/
arch/i386/kernel/cpu/mcheck/mce.c
@@
-12,6
+12,7
@@
#include <asm/processor.h>
#include <asm/system.h>
+#include <asm/mce.h>
#include "mce.h"
@@
-37,8
+38,7
@@
void mcheck_init(struct cpuinfo_x86 *c)
switch (c->x86_vendor) {
case X86_VENDOR_AMD:
- if (c->x86==6 || c->x86==15)
- amd_mcheck_init(c);
+ amd_mcheck_init(c);
break;
case X86_VENDOR_INTEL: