Skip to content

Commit 8654187

Browse files
chleroympe
authored andcommitted
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: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/1b68632425d8866d147aea9005004e4594672211.1601975100.git.christophe.leroy@csgroup.eu
1 parent 533090e commit 8654187

1 file changed

Lines changed: 0 additions & 15 deletions

File tree

arch/powerpc/kernel/head_book3s_32.S

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,8 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_HPTE_TABLE)
174174
bl reloc_offset
175175
li r24,0 /* cpu# */
176176
bl call_setup_cpu /* Call setup_cpu for this CPU */
177-
#ifdef CONFIG_PPC_BOOK3S_32
178177
bl reloc_offset
179178
bl init_idle_6xx
180-
#endif /* CONFIG_PPC_BOOK3S_32 */
181179

182180

183181
/*
@@ -878,10 +876,8 @@ __secondary_start:
878876
lis r3,-KERNELBASE@h
879877
mr r4,r24
880878
bl call_setup_cpu /* Call setup_cpu for this CPU */
881-
#ifdef CONFIG_PPC_BOOK3S_32
882879
lis r3,-KERNELBASE@h
883880
bl init_idle_6xx
884-
#endif /* CONFIG_PPC_BOOK3S_32 */
885881

886882
/* get current's stack and current */
887883
lis r2,secondary_current@ha
@@ -921,17 +917,6 @@ __secondary_start:
921917
#include "../kvm/book3s_rmhandlers.S"
922918
#endif
923919

924-
/*
925-
* Those generic dummy functions are kept for CPUs not
926-
* included in CONFIG_PPC_BOOK3S_32
927-
*/
928-
#if !defined(CONFIG_PPC_BOOK3S_32)
929-
_ENTRY(__save_cpu_setup)
930-
blr
931-
_ENTRY(__restore_cpu_setup)
932-
blr
933-
#endif /* !defined(CONFIG_PPC_BOOK3S_32) */
934-
935920
/*
936921
* Load stuff into the MMU. Intended to be called with
937922
* IR=0 and DR=0.

0 commit comments

Comments
 (0)