git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
x86, mce: use 64bit machine check code on 32bit
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
apic
/
nmi.c
diff --git
a/arch/x86/kernel/apic/nmi.c
b/arch/x86/kernel/apic/nmi.c
index
ce4fbfa
..
c476227
100644
(file)
--- a/
arch/x86/kernel/apic/nmi.c
+++ b/
arch/x86/kernel/apic/nmi.c
@@
-66,7
+66,7
@@
static inline unsigned int get_nmi_count(int cpu)
static inline int mce_in_progress(void)
{
-#if defined(CONFIG_X86_
64) && defined(CONFIG_X86
_MCE)
+#if defined(CONFIG_X86_
NEW
_MCE)
return atomic_read(&mce_entry) > 0;
#endif
return 0;