summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Kranzkowski <dl8bcu@dl8bcu.de>2008-06-23 20:57:22 +0000
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-23 18:26:04 -0700
commit72c6e251ed84b3a9cdfde6711191155c47bb2b9c (patch)
tree06b526bb6ee497bc19b8609753a5cd3e65ebc7b6
parent62786b9e81a2dbe9c073a2ade52d33a2627d6d85 (diff)
downloadop-kernel-dev-72c6e251ed84b3a9cdfde6711191155c47bb2b9c.zip
op-kernel-dev-72c6e251ed84b3a9cdfde6711191155c47bb2b9c.tar.gz
alpha: fix compile error in arch/alpha/mm/init.c
Commit 9267b4b3880d00dc2dab90f1d817c856939114f7 ("alpha: fix module load failures on smp (bug #10926)") causes a regression for my ev4 uniprocessor build: CC arch/alpha/mm/init.o /export/data/repositories/linux-2.6/arch/alpha/mm/init.c:34: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘typeof’ make[2]: *** [arch/alpha/mm/init.o] Error 1 make[1]: *** [arch/alpha/mm] Error 2 make: *** [sub-make] Error 2 This fixes it for me (compile and boot tested): Signed-off-by: Thorsten Kranzkowski <dl8bcu@dl8bcu.de> Acked-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/asm-alpha/percpu.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-alpha/percpu.h b/include/asm-alpha/percpu.h
index 82e8a94..3495e8e 100644
--- a/include/asm-alpha/percpu.h
+++ b/include/asm-alpha/percpu.h
@@ -69,6 +69,8 @@ extern unsigned long __per_cpu_offset[NR_CPUS];
#define __get_cpu_var(var) per_cpu_var(var)
#define __raw_get_cpu_var(var) per_cpu_var(var)
+#define PER_CPU_ATTRIBUTES
+
#endif /* SMP */
#define DECLARE_PER_CPU(type, name) extern __typeof__(type) per_cpu_var(name)
OpenPOWER on IntegriCloud