sparc32,leon: always include leon_smp + leon_mm in build

Fix-up leon specific assembler to use ASI_LEON_MMUREGS

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Daniel Hellstrom <daniel@gaisler.com>
Cc: Konrad Eisele <konrad@gaisler.com>

4 files changed, 1 insertions, 15 deletions

diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index 2dbe1806e530..8550f10af453 100644
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -393,7 +393,6 @@ linux_trap_ipi15_sun4d:
         /* FIXME */
 1:      b,a     1b
 
-#ifdef CONFIG_SPARC_LEON
         .globl  smpleon_ipi
         .extern leon_ipi_interrupt
         /* SMP per-cpu IPI interrupts are handled specially. */
@@ -424,8 +423,6 @@ linux_trap_ipi15_leon:
         b       ret_trap_lockless_ipi
          clr    %l6
 
-#endif /* CONFIG_SPARC_LEON */
-
 #endif /* CONFIG_SMP */
 
         /* This routine handles illegal instructions and privileged
diff --git a/arch/sparc/kernel/head_32.S b/arch/sparc/kernel/head_32.S
index 6c6b8c27c1b8..cdc7f29ba17b 100644
--- a/arch/sparc/kernel/head_32.S
+++ b/arch/sparc/kernel/head_32.S
@@ -387,12 +387,9 @@ execute_in_high_mem:
 #ifdef CONFIG_SMP
                 ldub    [%g2 + %lo(boot_cpu_id)], %g1
                 cmp     %g1, 0xff               ! unset means first CPU
-#ifdef CONFIG_SPARC_LEON
-                /* XXX Hack to allow build - remove ifdef later */
                 bne     leon_smp_cpu_startup    ! continue only with master
                  nop
 #endif
-#endif
                 /* Get CPU-ID from most significant 4-bit of ASR17 */
                 rd     %asr17, %g1
                 srl    %g1, 28, %g1
diff --git a/arch/sparc/kernel/leon_smp.c b/arch/sparc/kernel/leon_smp.c
index a469090faf9f..218c2f022695 100644
--- a/arch/sparc/kernel/leon_smp.c
+++ b/arch/sparc/kernel/leon_smp.c
@@ -48,8 +48,6 @@
 
 #include "kernel.h"
 
-#ifdef CONFIG_SPARC_LEON
-
 #include "irq.h"
 
 extern ctxd_t *srmmu_ctx_table_phys;
@@ -507,5 +505,3 @@ void __init leon_init_smp(void)
 
         sparc32_ipi_ops = &leon_ipi_ops;
 }
-
-#endif /* CONFIG_SPARC_LEON */
diff --git a/arch/sparc/kernel/trampoline_32.S b/arch/sparc/kernel/trampoline_32.S
index 7364ddc9e5aa..af27acab4486 100644
--- a/arch/sparc/kernel/trampoline_32.S
+++ b/arch/sparc/kernel/trampoline_32.S
@@ -149,8 +149,6 @@ sun4d_cpu_startup:
 
         b,a     smp_do_cpu_idle
 
-#ifdef CONFIG_SPARC_LEON
-
         __CPUINIT
         .align  4
         .global leon_smp_cpu_startup, smp_penguin_ctable
@@ -161,7 +159,7 @@ leon_smp_cpu_startup:
         ld [%g1+4],%g1
         srl %g1,4,%g1
         set 0x00000100,%g5 /* SRMMU_CTXTBL_PTR */
-        sta %g1, [%g5] ASI_M_MMUREGS
+        sta %g1, [%g5] ASI_LEON_MMUREGS
 
         /* Set up a sane %psr -- PIL<0xf> S<0x1> PS<0x1> CWP<0x0> */
         set     (PSR_PIL | PSR_S | PSR_PS), %g1
@@ -207,5 +205,3 @@ leon_smp_cpu_startup:
          nop
 
         b,a     smp_do_cpu_idle
-
-#endif