sparc32: Move sun4d show_leds() out of asm/obio.h

Put it, as well as cpu_leds[] array, into sun4d_irq.c

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/sparc/include/asm/obio.h b/arch/sparc/include/asm/obio.h
index 1a7544ceb57416c71f5de6e705f368ce8f79dab5..4ade0c8a2c79489b1c3d2e4a0b8195b739c52035 100644 (file)
--- a/arch/sparc/include/asm/obio.h
+++ b/arch/sparc/include/asm/obio.h
@@ -155,17 +155,6 @@ static inline void bw_set_ctrl(int cpu, unsigned ctrl)
                              "i" (ASI_M_CTL));
 }
 
-extern unsigned char cpu_leds[32];
-
-static inline void show_leds(int cpuid)
-{
-       cpuid &= 0x1e;
-       __asm__ __volatile__ ("stba %0, [%1] %2" : :
-                             "r" ((cpu_leds[cpuid] << 4) | cpu_leds[cpuid+1]),
-                             "r" (ECSR_BASE(cpuid) | BB_LEDS),
-                             "i" (ASI_M_CTL));
-}
-
 static inline unsigned cc_get_ipen(void)
 {
        unsigned pending;

diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c
index c4a2bfb750a4937eac2b782ee0ae03893096ec09..12541f51fcfc83509cc61a47dff2a8383c861b58 100644 (file)
--- a/arch/sparc/kernel/sun4d_irq.c
+++ b/arch/sparc/kernel/sun4d_irq.c
@@ -51,7 +51,6 @@ struct sun4d_timer_regs *sun4d_timers;
 #define MAX_STATIC_ALLOC       4
 extern struct irqaction static_irqaction[MAX_STATIC_ALLOC];
 extern int static_irq_count;
-unsigned char cpu_leds[32];
 #ifdef CONFIG_SMP
 static unsigned char sbus_tid[32];
 #endif

diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c
index 72fa8daab60b6f96b69e19011edf4106ea286845..49a08b487ca7a3fc5896c6a5c83f3d8d6e737918 100644 (file)
--- a/arch/sparc/kernel/sun4d_smp.c
+++ b/arch/sparc/kernel/sun4d_smp.c
@@ -71,6 +71,17 @@ static void smp_setup_percpu_timer(void);
 extern void cpu_probe(void);
 extern void sun4d_distribute_irqs(void);
 
+static unsigned char cpu_leds[32];
+
+static inline void show_leds(int cpuid)
+{
+       cpuid &= 0x1e;
+       __asm__ __volatile__ ("stba %0, [%1] %2" : :
+                             "r" ((cpu_leds[cpuid] << 4) | cpu_leds[cpuid+1]),
+                             "r" (ECSR_BASE(cpuid) | BB_LEDS),
+                             "i" (ASI_M_CTL));
+}
+
 void __init smp4d_callin(void)
 {
        int cpuid = hard_smp4d_processor_id();