diff options
author | David S. Miller <davem@davemloft.net> | 2008-09-02 04:17:41 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-09-08 18:40:45 -0400 |
commit | 7b1af32f52077402157f8bb8fc22d8da17606095 (patch) | |
tree | 892fea67b0775b1d87319b092e93e206e293a911 /arch/sparc/kernel | |
parent | 365b50f0f09c1a24f1a60e0c027f300ed423c192 (diff) |
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>
Diffstat (limited to 'arch/sparc/kernel')
-rw-r--r-- | arch/sparc/kernel/sun4d_irq.c | 1 | ||||
-rw-r--r-- | arch/sparc/kernel/sun4d_smp.c | 11 |
2 files changed, 11 insertions, 1 deletions
diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c index c4a2bfb750a4..12541f51fcfc 100644 --- a/arch/sparc/kernel/sun4d_irq.c +++ b/arch/sparc/kernel/sun4d_irq.c | |||
@@ -51,7 +51,6 @@ struct sun4d_timer_regs *sun4d_timers; | |||
51 | #define MAX_STATIC_ALLOC 4 | 51 | #define MAX_STATIC_ALLOC 4 |
52 | extern struct irqaction static_irqaction[MAX_STATIC_ALLOC]; | 52 | extern struct irqaction static_irqaction[MAX_STATIC_ALLOC]; |
53 | extern int static_irq_count; | 53 | extern int static_irq_count; |
54 | unsigned char cpu_leds[32]; | ||
55 | #ifdef CONFIG_SMP | 54 | #ifdef CONFIG_SMP |
56 | static unsigned char sbus_tid[32]; | 55 | static unsigned char sbus_tid[32]; |
57 | #endif | 56 | #endif |
diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c index 72fa8daab60b..49a08b487ca7 100644 --- 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); | |||
71 | extern void cpu_probe(void); | 71 | extern void cpu_probe(void); |
72 | extern void sun4d_distribute_irqs(void); | 72 | extern void sun4d_distribute_irqs(void); |
73 | 73 | ||
74 | static unsigned char cpu_leds[32]; | ||
75 | |||
76 | static inline void show_leds(int cpuid) | ||
77 | { | ||
78 | cpuid &= 0x1e; | ||
79 | __asm__ __volatile__ ("stba %0, [%1] %2" : : | ||
80 | "r" ((cpu_leds[cpuid] << 4) | cpu_leds[cpuid+1]), | ||
81 | "r" (ECSR_BASE(cpuid) | BB_LEDS), | ||
82 | "i" (ASI_M_CTL)); | ||
83 | } | ||
84 | |||
74 | void __init smp4d_callin(void) | 85 | void __init smp4d_callin(void) |
75 | { | 86 | { |
76 | int cpuid = hard_smp4d_processor_id(); | 87 | int cpuid = hard_smp4d_processor_id(); |