diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 09:02:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 09:02:49 -0700 |
| commit | 9c688c114c4665ac8c6da05b2f6b987f4adc6dae (patch) | |
| tree | b6f20a4d6fa4bb5efa0cad5d1dc75ec2b1c2b163 /arch/ia64 | |
| parent | 9d35bc1ec696ebfc5662a0d00b4d36564ff3af53 (diff) | |
| parent | 308eb7add8adaca8088c28a3f7610069b70d1ad6 (diff) | |
| download | lwn-9c688c114c4665ac8c6da05b2f6b987f4adc6dae.tar.gz lwn-9c688c114c4665ac8c6da05b2f6b987f4adc6dae.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
ia64: add sparse annotation to __ia64_per_cpu_var()
percpu: implement kernel memory based chunk allocation
percpu: move vmalloc based chunk management into percpu-vm.c
percpu: misc preparations for nommu support
percpu: reorganize chunk creation and destruction
percpu: factor out pcpu_addr_in_first/reserved_chunk() and update per_cpu_ptr_to_phys()
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/include/asm/percpu.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/percpu.h b/arch/ia64/include/asm/percpu.h index f7c00a5e0e2b..1bd408265694 100644 --- a/arch/ia64/include/asm/percpu.h +++ b/arch/ia64/include/asm/percpu.h @@ -39,7 +39,10 @@ extern void *per_cpu_init(void); * On the positive side, using __ia64_per_cpu_var() instead of __get_cpu_var() is slightly * more efficient. */ -#define __ia64_per_cpu_var(var) var +#define __ia64_per_cpu_var(var) (*({ \ + __verify_pcpu_ptr(&(var)); \ + ((typeof(var) __kernel __force *)&(var)); \ +})) #include <asm-generic/percpu.h> |