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 <[email protected]>
----
diff -urN RC13-rc6-git13-m32r-smp/arch/m32r/kernel/setup_m32700ut.c RC13-rc6-git13-m32r-icu_data/arch/m32r/kernel/setup_m32700ut.c
--- RC13-rc6-git13-m32r-smp/arch/m32r/kernel/setup_m32700ut.c 2005-08-10 10:37:46.000000000 -0400
+++ RC13-rc6-git13-m32r-icu_data/arch/m32r/kernel/setup_m32700ut.c 2005-08-21 13:17:13.000000000 -0400
@@ -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 -urN RC13-rc6-git13-m32r-smp/arch/m32r/kernel/setup_opsput.c RC13-rc6-git13-m32r-icu_data/arch/m32r/kernel/setup_opsput.c
--- RC13-rc6-git13-m32r-smp/arch/m32r/kernel/setup_opsput.c 2005-08-10 10:37:46.000000000 -0400
+++ RC13-rc6-git13-m32r-icu_data/arch/m32r/kernel/setup_opsput.c 2005-08-21 13:17:13.000000000 -0400
@@ -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)
{
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
| |
 |