diff options
| author | Sam Ravnborg | 2012-05-25 23:20:14 +0200 |
|---|---|---|
| committer | David S. Miller | 2012-05-28 08:52:47 +0200 |
| commit | 3107948848ebc52b98ffd853f72065338bbc57e2 (patch) | |
| tree | 765f7997db7c31f09d415303e755edb600ebfc4a /arch/sparc/kernel/trampoline_32.S | |
| parent | sparc32,leon: always include leon_kernel in build (diff) | |
| download | kernel-qcow2-linux-3107948848ebc52b98ffd853f72065338bbc57e2.tar.gz kernel-qcow2-linux-3107948848ebc52b98ffd853f72065338bbc57e2.tar.xz kernel-qcow2-linux-3107948848ebc52b98ffd853f72065338bbc57e2.zip | |
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>
Diffstat (limited to 'arch/sparc/kernel/trampoline_32.S')
| -rw-r--r-- | arch/sparc/kernel/trampoline_32.S | 6 |
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: 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 |