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-10-28 18:00:59 +1100 |
| commit | bdf1597b61d505b28e85c3f6dbc71bf553ce83da (patch) | |
| tree | 1d6e9cadbfb0393ae46ac0409b94db51665d9622 | |
| parent | b88aea463a3999a097804af9f504db6b4c03204a (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 dd6693fe4799..2eab4d58c0ac 100644 --- a/include/linux/percpu.h +++ b/include/linux/percpu.h @@ -174,7 +174,6 @@ static inline void cpu_free(void *cpu_pointer, unsigned long size) } #define SHIFT_PERCPU_PTR(__p, __offset) (__p) -#define per_cpu_offset(x) 0 #endif /* Return a pointer to the instance of a object for a particular processor */ |