aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/trampoline_32.S
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sparc/kernel/trampoline_32.S')
-rw-r--r--arch/sparc/kernel/trampoline_32.S6
1 files changed, 1 insertions, 5 deletions
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:
149 149
150 b,a smp_do_cpu_idle 150 b,a smp_do_cpu_idle
151 151
152#ifdef CONFIG_SPARC_LEON
153
154 __CPUINIT 152 __CPUINIT
155 .align 4 153 .align 4
156 .global leon_smp_cpu_startup, smp_penguin_ctable 154 .global leon_smp_cpu_startup, smp_penguin_ctable
@@ -161,7 +159,7 @@ leon_smp_cpu_startup:
161 ld [%g1+4],%g1 159 ld [%g1+4],%g1
162 srl %g1,4,%g1 160 srl %g1,4,%g1
163 set 0x00000100,%g5 /* SRMMU_CTXTBL_PTR */ 161 set 0x00000100,%g5 /* SRMMU_CTXTBL_PTR */
164 sta %g1, [%g5] ASI_M_MMUREGS 162 sta %g1, [%g5] ASI_LEON_MMUREGS
165 163
166 /* Set up a sane %psr -- PIL<0xf> S<0x1> PS<0x1> CWP<0x0> */ 164 /* Set up a sane %psr -- PIL<0xf> S<0x1> PS<0x1> CWP<0x0> */
167 set (PSR_PIL | PSR_S | PSR_PS), %g1 165 set (PSR_PIL | PSR_S | PSR_PS), %g1
@@ -207,5 +205,3 @@ leon_smp_cpu_startup:
207 nop 205 nop
208 206
209 b,a smp_do_cpu_idle 207 b,a smp_do_cpu_idle
210
211#endif