Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c51d9943 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[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: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e231a9c4

arch/m32r/kernel/setup_m32700ut.c

+3 −1
Original line number Diff line number Diff line
@@ -30,9 +30,11 @@ 
typedef struct {

	unsigned long icucr;  /* ICU Control Register */

} icu_data_t;

static icu_data_t icu_data[M32700UT_NUM_CPU_IRQ];

#else

icu_data_t icu_data[M32700UT_NUM_CPU_IRQ];

#endif /* CONFIG_SMP */



static icu_data_t icu_data[M32700UT_NUM_CPU_IRQ];



static void disable_m32700ut_irq(unsigned int irq)

{

arch/m32r/kernel/setup_opsput.c

+3 −1
Original line number Diff line number Diff line
@@ -31,9 +31,11 @@ 
typedef struct {

	unsigned long icucr;  /* ICU Control Register */

} icu_data_t;

static icu_data_t icu_data[OPSPUT_NUM_CPU_IRQ];

#else

icu_data_t icu_data[OPSPUT_NUM_CPU_IRQ];

#endif /* CONFIG_SMP */



static icu_data_t icu_data[OPSPUT_NUM_CPU_IRQ];



static void disable_opsput_irq(unsigned int irq)

{