Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / arch / sparc / kernel / sun4d_smp.c

diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c
index 446767e8f5694651b914cce1c1206796bd2f103d..ce3d45db94e9f777d3520e52c2052c33cfc93017 100644 (file)
--- a/arch/sparc/kernel/sun4d_smp.c
+++ b/arch/sparc/kernel/sun4d_smp.c
@@ -30,7 +30,6 @@
 #include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/oplib.h>
-#include <asm/sbus.h>
 #include <asm/sbi.h>
 #include <asm/tlbflush.h>
 #include <asm/cacheflush.h>
@@ -72,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();