Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 72c6e251ed84b3a9cdfde6711191155c47bb2b9c

Authored by Thorsten Kranzkowski
Committed by Linus Torvalds
1 parent 62786b9e81

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>

Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff

include/asm-alpha/percpu.h
Diff comments   View file @ 72c6e25
... ... @@ -69,6 +69,8 @@
69 69 #define __get_cpu_var(var) per_cpu_var(var)
70 70 #define __raw_get_cpu_var(var) per_cpu_var(var)
71 71  
  72 +#define PER_CPU_ATTRIBUTES
  73 +
72 74 #endif /* SMP */
73 75  
74 76 #define DECLARE_PER_CPU(type, name) extern __typeof__(type) per_cpu_var(name)