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 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
cpu
/
mcheck
/
mce.c
diff --git
a/arch/x86/kernel/cpu/mcheck/mce.c
b/arch/x86/kernel/cpu/mcheck/mce.c
index
3ab9c88
..
7a355dd
100644
(file)
--- a/
arch/x86/kernel/cpu/mcheck/mce.c
+++ b/
arch/x86/kernel/cpu/mcheck/mce.c
@@
-26,6
+26,7
@@
#include <linux/sched.h>
#include <linux/sysfs.h>
#include <linux/types.h>
#include <linux/sched.h>
#include <linux/sysfs.h>
#include <linux/types.h>
+#include <linux/slab.h>
#include <linux/init.h>
#include <linux/kmod.h>
#include <linux/poll.h>
#include <linux/init.h>
#include <linux/kmod.h>
#include <linux/poll.h>
@@
-538,7
+539,7
@@
void machine_check_poll(enum mcp_flags flags, mce_banks_t *b)
struct mce m;
int i;
struct mce m;
int i;
-
__get_cpu_var(mce_poll_count)++
;
+
percpu_inc(mce_poll_count)
;
mce_setup(&m);
mce_setup(&m);
@@
-933,7
+934,7
@@
void do_machine_check(struct pt_regs *regs, long error_code)
atomic_inc(&mce_entry);
atomic_inc(&mce_entry);
-
__get_cpu_var(mce_exception_count)++
;
+
percpu_inc(mce_exception_count)
;
if (notify_die(DIE_NMI, "machine check", regs, error_code,
18, SIGKILL) == NOTIFY_STOP)
if (notify_die(DIE_NMI, "machine check", regs, error_code,
18, SIGKILL) == NOTIFY_STOP)