diff options
| author | Al Viro <viro@www.linux.org.uk> | 2005-08-23 22:47:22 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-23 18:43:44 -0700 |
| commit | c51d9943b11441fd1ea42c7e70cfb5eed33fe97b (patch) | |
| tree | 18f2694b421cba1e0160db3781346d577a1e9b5a /arch/m32r | |
| parent | e231a9c4fdf402bcfd5a7c27be49050882631a95 (diff) | |
| download | linux-3.10-c51d9943b11441fd1ea42c7e70cfb5eed33fe97b.tar.gz linux-3.10-c51d9943b11441fd1ea42c7e70cfb5eed33fe97b.tar.bz2 linux-3.10-c51d9943b11441fd1ea42c7e70cfb5eed33fe97b.zip | |
[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>
Diffstat (limited to 'arch/m32r')
| -rw-r--r-- | arch/m32r/kernel/setup_m32700ut.c | 4 | ||||
| -rw-r--r-- | arch/m32r/kernel/setup_opsput.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/m32r/kernel/setup_m32700ut.c b/arch/m32r/kernel/setup_m32700ut.c index a146b24a556..708634b685e 100644 --- a/arch/m32r/kernel/setup_m32700ut.c +++ b/arch/m32r/kernel/setup_m32700ut.c @@ -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) { diff --git a/arch/m32r/kernel/setup_opsput.c b/arch/m32r/kernel/setup_opsput.c index f0301f58bcc..d7b7ec6d30f 100644 --- a/arch/m32r/kernel/setup_opsput.c +++ b/arch/m32r/kernel/setup_opsput.c @@ -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) { |