Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+11 -12
-11
arch/sparc/include/asm/obio.h
··· 155 155 "i" (ASI_M_CTL)); 156 156 } 157 157 158 - extern unsigned char cpu_leds[32]; 159 - 160 - static inline void show_leds(int cpuid) 161 - { 162 - cpuid &= 0x1e; 163 - __asm__ __volatile__ ("stba %0, [%1] %2" : : 164 - "r" ((cpu_leds[cpuid] << 4) | cpu_leds[cpuid+1]), 165 - "r" (ECSR_BASE(cpuid) | BB_LEDS), 166 - "i" (ASI_M_CTL)); 167 - } 168 - 169 158 static inline unsigned cc_get_ipen(void) 170 159 { 171 160 unsigned pending;
-1
arch/sparc/kernel/sun4d_irq.c
··· 51 51 #define MAX_STATIC_ALLOC 4 52 52 extern struct irqaction static_irqaction[MAX_STATIC_ALLOC]; 53 53 extern int static_irq_count; 54 - unsigned char cpu_leds[32]; 55 54 #ifdef CONFIG_SMP 56 55 static unsigned char sbus_tid[32]; 57 56 #endif
+11
arch/sparc/kernel/sun4d_smp.c
··· 71 71 extern void cpu_probe(void); 72 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 85 void __init smp4d_callin(void) 75 86 { 76 87 int cpuid = hard_smp4d_processor_id();