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
/
oprofile
/
nmi_int.c
diff --git
a/arch/x86/oprofile/nmi_int.c
b/arch/x86/oprofile/nmi_int.c
index
358c8b9
..
f24a853
100644
(file)
--- a/
arch/x86/oprofile/nmi_int.c
+++ b/
arch/x86/oprofile/nmi_int.c
@@
-143,7
+143,7
@@
static inline int has_mux(void)
inline int op_x86_phys_to_virt(int phys)
{
- return __
get_cpu_var
(switch_index) + phys;
+ return __
this_cpu_read
(switch_index) + phys;
}
inline int op_x86_virt_to_phys(int virt)