tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] m32r icu_data gcc4 fixes

either icu_data declaration for SMP case should be taken out of m32102.h,
or its declarations for m32700ut and opsput should not be static for SMP.
Patch does the latter - judging by comments in m32102.h it is intended to
be non-static.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Al Viro and committed by Linus Torvalds c51d9943 e231a9c4

+6 -2
unified split
+3 -1
arch/m32r/kernel/setup_m32700ut.c
··· 30 typedef struct { 31 unsigned long icucr; /* ICU Control Register */ 32 } icu_data_t; 33 #endif /* CONFIG_SMP */ 34 35 - static icu_data_t icu_data[M32700UT_NUM_CPU_IRQ]; 36 37 static void disable_m32700ut_irq(unsigned int irq) 38 {
··· 30 typedef struct { 31 unsigned long icucr; /* ICU Control Register */ 32 } icu_data_t; 33 + static icu_data_t icu_data[M32700UT_NUM_CPU_IRQ]; 34 + #else 35 + icu_data_t icu_data[M32700UT_NUM_CPU_IRQ]; 36 #endif /* CONFIG_SMP */ 37 38 39 static void disable_m32700ut_irq(unsigned int irq) 40 {
+3 -1
arch/m32r/kernel/setup_opsput.c
··· 31 typedef struct { 32 unsigned long icucr; /* ICU Control Register */ 33 } icu_data_t; 34 #endif /* CONFIG_SMP */ 35 36 - static icu_data_t icu_data[OPSPUT_NUM_CPU_IRQ]; 37 38 static void disable_opsput_irq(unsigned int irq) 39 {
··· 31 typedef struct { 32 unsigned long icucr; /* ICU Control Register */ 33 } icu_data_t; 34 + static icu_data_t icu_data[OPSPUT_NUM_CPU_IRQ]; 35 + #else 36 + icu_data_t icu_data[OPSPUT_NUM_CPU_IRQ]; 37 #endif /* CONFIG_SMP */ 38 39 40 static void disable_opsput_irq(unsigned int irq) 41 {