lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] m32r icu_data gcc4 fixes

Browse Source 
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>
This commit is contained in:
Al Viro
2005-08-23 22:47:22 +01:00
committed by Linus Torvalds
parent e231a9c4fd
commit c51d9943b1
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/m32r/kernel/setup_m32700ut.c
View File

@@ -30,9 +30,11 @@
typedef struct { typedef struct {
unsigned long icucr; /* ICU Control Register */ unsigned long icucr; /* ICU Control Register */
} icu_data_t; } 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 */ #endif /* CONFIG_SMP */
static icu_data_t icu_data[M32700UT_NUM_CPU_IRQ];
static void disable_m32700ut_irq(unsigned int irq) static void disable_m32700ut_irq(unsigned int irq)
{ {

4
arch/m32r/kernel/setup_opsput.c
View File

@@ -31,9 +31,11 @@
typedef struct { typedef struct {
unsigned long icucr; /* ICU Control Register */ unsigned long icucr; /* ICU Control Register */
} icu_data_t; } 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 */ #endif /* CONFIG_SMP */
static icu_data_t icu_data[OPSPUT_NUM_CPU_IRQ];
static void disable_opsput_irq(unsigned int irq) static void disable_opsput_irq(unsigned int irq)
{ {