openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Christophe Leroy 2020-10-06 09:05:37 +00:00 committed by Michael Ellerman
parent 533090e5a9
commit 865418795a
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/powerpc/kernel/head_book3s_32.S
View File

@ -174,10 +174,8 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_HPTE_TABLE)
bl reloc_offset bl reloc_offset
li r24,0 /* cpu# */ li r24,0 /* cpu# */
bl call_setup_cpu /* Call setup_cpu for this CPU */ bl call_setup_cpu /* Call setup_cpu for this CPU */
#ifdef CONFIG_PPC_BOOK3S_32
bl reloc_offset bl reloc_offset
bl init_idle_6xx bl init_idle_6xx
#endif /* CONFIG_PPC_BOOK3S_32 */
/* /*
@ -878,10 +876,8 @@ __secondary_start:
lis r3,-KERNELBASE@h lis r3,-KERNELBASE@h
mr r4,r24 mr r4,r24
bl call_setup_cpu /* Call setup_cpu for this CPU */ bl call_setup_cpu /* Call setup_cpu for this CPU */
#ifdef CONFIG_PPC_BOOK3S_32
lis r3,-KERNELBASE@h lis r3,-KERNELBASE@h
bl init_idle_6xx bl init_idle_6xx
#endif /* CONFIG_PPC_BOOK3S_32 */
/* get current's stack and current */ /* get current's stack and current */
lis r2,secondary_current@ha lis r2,secondary_current@ha
@ -921,17 +917,6 @@ __secondary_start:
#include "../kvm/book3s_rmhandlers.S" #include "../kvm/book3s_rmhandlers.S"
#endif #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 * Load stuff into the MMU. Intended to be called with
* IR=0 and DR=0. * IR=0 and DR=0.