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
/
ia64
/
include
/
asm
/
uv
/
uv_hub.h
diff --git
a/arch/ia64/include/asm/uv/uv_hub.h
b/arch/ia64/include/asm/uv/uv_hub.h
index
53e9dfa
..
2a88c72
100644
(file)
--- a/
arch/ia64/include/asm/uv/uv_hub.h
+++ b/
arch/ia64/include/asm/uv/uv_hub.h
@@
-108,7
+108,7
@@
struct uv_hub_info_s {
unsigned char n_val;
};
DECLARE_PER_CPU(struct uv_hub_info_s, __uv_hub_info);
-#define uv_hub_info
(&__get_cpu_var(__uv_hub_info)
)
+#define uv_hub_info
this_cpu_ptr(&__uv_hub_info
)
#define uv_cpu_hub_info(cpu) (&per_cpu(__uv_hub_info, cpu))
/*