From 3107948848ebc52b98ffd853f72065338bbc57e2 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Fri, 25 May 2012 21:20:14 +0000 Subject: 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 Cc: Daniel Hellstrom Cc: Konrad Eisele --- arch/sparc/kernel/head_32.S | 3 --- 1 file changed, 3 deletions(-) (limited to 'arch/sparc/kernel/head_32.S') 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,11 +387,8 @@ 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 -- cgit v1.2.1