summaryrefslogtreecommitdiff
path: root/arch/sparc/kernel/head_32.S
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2012-05-25 21:20:14 +0000
committerDavid S. Miller <davem@davemloft.net>2012-05-27 23:52:47 -0700
commit3107948848ebc52b98ffd853f72065338bbc57e2 (patch)
tree765f7997db7c31f09d415303e755edb600ebfc4a /arch/sparc/kernel/head_32.S
parent5561cd269820252dccf08b1cc093afbc2f06242d (diff)
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/head_32.S')
-rw-r--r--arch/sparc/kernel/head_32.S3
1 files changed, 0 insertions, 3 deletions
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