diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-28 17:56:26 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-11-05 17:12:45 +1100 |
| commit | 74daf0a58f1bca091af4255b5dbad6f18956c0a2 (patch) | |
| tree | 7fe5e56cca7a4fe0453d30e46fba42846646da42 | |
| parent | fa63e998635b72c96d3d338d430b996e20fac6c4 (diff) | |
cpu_alloc: per_cpu_offset is already defined for !CONFIG_SMP
in asm-generic/percpu.h which is included by asm/percpu.h on all
architectures except alpha.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | arch/alpha/include/asm/percpu.h | 1 | ||||
| -rw-r--r-- | include/linux/percpu.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/include/asm/percpu.h b/arch/alpha/include/asm/percpu.h index 3495e8e00d70..4d0f7f3d2817 100644 --- a/arch/alpha/include/asm/percpu.h +++ b/arch/alpha/include/asm/percpu.h @@ -68,6 +68,7 @@ extern unsigned long __per_cpu_offset[NR_CPUS]; #define per_cpu(var, cpu) (*((void)(cpu), &per_cpu_var(var))) #define __get_cpu_var(var) per_cpu_var(var) #define __raw_get_cpu_var(var) per_cpu_var(var) +#define per_cpu_offset(x) 0 #define PER_CPU_ATTRIBUTES diff --git a/include/linux/percpu.h b/include/linux/percpu.h index 33b9526e98e3..5d73feeff9c7 100644 --- a/include/linux/percpu.h +++ b/include/linux/percpu.h @@ -162,7 +162,6 @@ void *cpu_alloc(unsigned long size, gfp_t flags, unsigned long align); void cpu_free(void *cpu_pointer, unsigned long size); #ifndef CONFIG_SMP -#define per_cpu_offset(x) 0 #define SHIFT_PERCPU_PTR(__p, __offset) (__p) #endif |