projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mac80211-next-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
arch
/
sparc
/
include
/
asm
/
cpudata_64.h
diff --git
a/arch/sparc/include/asm/cpudata_64.h
b/arch/sparc/include/asm/cpudata_64.h
index
0e59407
..
a6e424d
100644
(file)
--- a/
arch/sparc/include/asm/cpudata_64.h
+++ b/
arch/sparc/include/asm/cpudata_64.h
@@
-30,7
+30,7
@@
typedef struct {
DECLARE_PER_CPU(cpuinfo_sparc, __cpu_data);
#define cpu_data(__cpu) per_cpu(__cpu_data, (__cpu))
-#define local_cpu_data()
__get_cpu_var(__cpu_data
)
+#define local_cpu_data()
(*this_cpu_ptr(&__cpu_data)
)
#endif /* !(__ASSEMBLY__) */