Commit 86541879 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/32s: Remove #ifdef CONFIG_PPC_BOOK3S_32 in head_book3s_32.S 



head_book3s_32.S is only built when CONFIG_PPC_BOOK3S_32 is selected.

Remove all conditions based on CONFIG_PPC_BOOK3S_32 in the file.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/1b68632425d8866d147aea9005004e4594672211.1601975100.git.christophe.leroy@csgroup.eu
parent 533090e5

arch/powerpc/kernel/head_book3s_32.S

+0 −15
Original line number Diff line number Diff line
@@ -174,10 +174,8 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_HPTE_TABLE) 
	bl	reloc_offset

	li	r24,0			/* cpu# */

	bl	call_setup_cpu		/* Call setup_cpu for this CPU */

#ifdef CONFIG_PPC_BOOK3S_32

	bl	reloc_offset

	bl	init_idle_6xx

#endif /* CONFIG_PPC_BOOK3S_32 */





/*
@@ -878,10 +876,8 @@ __secondary_start: 
	lis	r3,-KERNELBASE@h

	mr	r4,r24

	bl	call_setup_cpu		/* Call setup_cpu for this CPU */

#ifdef CONFIG_PPC_BOOK3S_32

	lis	r3,-KERNELBASE@h

	bl	init_idle_6xx

#endif /* CONFIG_PPC_BOOK3S_32 */



	/* get current's stack and current */

	lis	r2,secondary_current@ha
@@ -921,17 +917,6 @@ __secondary_start: 
#include "../kvm/book3s_rmhandlers.S"

#endif



/*

 * Those generic dummy functions are kept for CPUs not

 * included in CONFIG_PPC_BOOK3S_32

 */

#if !defined(CONFIG_PPC_BOOK3S_32)

_ENTRY(__save_cpu_setup)

	blr

_ENTRY(__restore_cpu_setup)

	blr

#endif /* !defined(CONFIG_PPC_BOOK3S_32) */



/*

 * Load stuff into the MMU.  Intended to be called with

 * IR=0 and DR=0.

CRA Git | Maintained and supported by SUSTech CRA and CCSE