diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 19:42:40 +0300 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 19:42:40 +0300 |
| commit | 85a07029aaba8f5b27241bcff56cc009c9f4993b (patch) | |
| tree | c579554c2ea9c942ccbea60e223bc62d8262f652 /include/linux/percpu.h | |
| parent | 0da36b3467040908d3df6bc1f5b4d592a8b23b63 (diff) | |
| parent | 79bfb0a98fdc73ed6a18469cef245cbf50a1d8bb (diff) | |
| download | linux-85a07029aaba8f5b27241bcff56cc009c9f4993b.tar.xz | |
Merge branch 'upstream'
Diffstat (limited to 'include/linux/percpu.h')
| -rw-r--r-- | include/linux/percpu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/percpu.h b/include/linux/percpu.h index 5451eb1e781d..fb8d2d24e4bb 100644 --- a/include/linux/percpu.h +++ b/include/linux/percpu.h @@ -38,7 +38,7 @@ extern void free_percpu(const void *); #else /* CONFIG_SMP */ -#define per_cpu_ptr(ptr, cpu) (ptr) +#define per_cpu_ptr(ptr, cpu) ({ (void)(cpu); (ptr); }) static inline void *__alloc_percpu(size_t size, size_t align) { |