diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2009-10-29 09:34:15 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2009-10-29 09:34:15 -0400 |
commit | dd17c8f72993f9461e9c19250e3f155d6d99df22 (patch) | |
tree | c33eedf0cf2862e9feeb796e94d49a2ccdce0149 /include/linux/percpu.h | |
parent | 390dfd95c5df1ab3921dd388d11b2aee332c3f2c (diff) |
percpu: remove per_cpu__ prefix.
Now that the return from alloc_percpu is compatible with the address
of per-cpu vars, it makes sense to hand around the address of per-cpu
variables. To make this sane, we remove the per_cpu__ prefix we used
created to stop people accidentally using these vars directly.
Now we have sparse, we can use that (next patch).
tj: * Updated to convert stuff which were missed by or added after the
original patch.
* Kill per_cpu_var() macro.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Tejun Heo <tj@kernel.org>
Reviewed-by: Christoph Lameter <cl@linux-foundation.org>
Diffstat (limited to 'include/linux/percpu.h')
-rw-r--r-- | include/linux/percpu.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/percpu.h b/include/linux/percpu.h index 522f421ec213..e12410e55e05 100644 --- a/include/linux/percpu.h +++ b/include/linux/percpu.h | |||
@@ -182,7 +182,7 @@ static inline void *pcpu_lpage_remapped(void *kaddr) | |||
182 | #ifndef percpu_read | 182 | #ifndef percpu_read |
183 | # define percpu_read(var) \ | 183 | # define percpu_read(var) \ |
184 | ({ \ | 184 | ({ \ |
185 | typeof(per_cpu_var(var)) __tmp_var__; \ | 185 | typeof(var) __tmp_var__; \ |
186 | __tmp_var__ = get_cpu_var(var); \ | 186 | __tmp_var__ = get_cpu_var(var); \ |
187 | put_cpu_var(var); \ | 187 | put_cpu_var(var); \ |
188 | __tmp_var__; \ | 188 | __tmp_var__; \ |
@@ -253,8 +253,7 @@ do { \ | |||
253 | 253 | ||
254 | /* | 254 | /* |
255 | * Optimized manipulation for memory allocated through the per cpu | 255 | * Optimized manipulation for memory allocated through the per cpu |
256 | * allocator or for addresses of per cpu variables (can be determined | 256 | * allocator or for addresses of per cpu variables. |
257 | * using per_cpu_var(xx). | ||
258 | * | 257 | * |
259 | * These operation guarantee exclusivity of access for other operations | 258 | * These operation guarantee exclusivity of access for other operations |
260 | * on the *same* processor. The assumption is that per cpu data is only | 259 | * on the *same* processor. The assumption is that per cpu data is only |