Subject: linux-next: zero based percpu build error on s390

From: Heiko Carstens <[email-masked]>
Date: Thu, 3 Jul 2008 21:30:09 +0200

The patch:
"Zero based percpu: infrastructure to rebase the per cpu area to zero"

causes this build error on !CONFIG_SMP on linux-next / s390:

  CC      arch/s390/kernel/asm-offsets.s
In file included from include/asm/percpu.h:35,
                 from include/linux/percpu.h:9,
                 from include/linux/rcupdate.h:39,
                 from include/linux/pid.h:4,
                 from include/linux/sched.h:74,
                 from arch/s390/kernel/asm-offsets.c:7:
include/asm-generic/percpu.h:78:1: warning: "SHIFT_PERCPU_PTR" redefined
In file included from include/linux/percpu.h:9,
                 from include/linux/rcupdate.h:39,
                 from include/linux/pid.h:4,
                 from include/linux/sched.h:74,
                 from arch/s390/kernel/asm-offsets.c:7:
include/asm/percpu.h:25:1: warning: this is the location of the previous definition

Fix below. Please merge with original patch.

Signed-off-by: Heiko Carstens <[email-masked]>
---
 include/asm-generic/percpu.h |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: linux-next/include/asm-generic/percpu.h
===================================================================
--- linux-next.orig/include/asm-generic/percpu.h
+++ linux-next/include/asm-generic/percpu.h
@@ -75,7 +75,9 @@ extern void setup_per_cpu_areas(void);
 #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 SHIFT_PERCPU_PTR(__p, __offset)		(__p)
+#ifndef SHIFT_PERCPU_PTR
+# define SHIFT_PERCPU_PTR(__p, __offset)		(__p)
+#endif
 #define per_cpu_offset(x)			0L
 
 #endif	/* SMP */