]> err.no Git - linux-2.6/commitdiff
alpha: fix compile error in arch/alpha/mm/init.c
authorThorsten Kranzkowski <dl8bcu@dl8bcu.de>
Mon, 23 Jun 2008 20:57:22 +0000 (20:57 +0000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Jun 2008 01:26:04 +0000 (18:26 -0700)
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>
include/asm-alpha/percpu.h

index 82e8a94b4b2f8717522a806b719472408af13985..3495e8e00d70fd2ca96531e702b1956a3aa5f5de 100644 (file)
@@ -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)