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
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
cpu
/
mcheck
/
mce_intel.c
diff --git
a/arch/x86/kernel/cpu/mcheck/mce_intel.c
b/arch/x86/kernel/cpu/mcheck/mce_intel.c
index
6fcd093
..
8694ef5
100644
(file)
--- a/
arch/x86/kernel/cpu/mcheck/mce_intel.c
+++ b/
arch/x86/kernel/cpu/mcheck/mce_intel.c
@@
-130,7
+130,7
@@
void cmci_recheck(void)
unsigned long flags;
int banks;
unsigned long flags;
int banks;
- if (!mce_available(
¤t_cpu_data
) || !cmci_supported(&banks))
+ if (!mce_available(
__this_cpu_ptr(&cpu_info)
) || !cmci_supported(&banks))
return;
local_irq_save(flags);
machine_check_poll(MCP_TIMESTAMP, &__get_cpu_var(mce_banks_owned));
return;
local_irq_save(flags);
machine_check_poll(MCP_TIMESTAMP, &__get_cpu_var(mce_banks_owned));