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

powerpc/64e: Fix circular dependency with CONFIG_SMP disabled 



asm/percpu.h includes asm/paca.h which needs struct tlb_core_data
which is defined in mmu-e500.h

asm/percpu.h is included from asm/mmu.h in a #ifdef CONFIG_E500
before the inclusion of mmu-e500.h

To fix that, move the inclusion of asm/percpu.h into mmu-e500.h
after the definition of struct tlb_core_data

Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202308220708.nRf5AUAe-lkp@intel.com/
Closes: https://lore.kernel.org/oe-kbuild-all/202308220857.uFq2oAxM-lkp@intel.com/
Closes: https://lore.kernel.org/oe-kbuild-all/202308221055.lw3UzJIL-lkp@intel.com/


Fixes: 3a24ea0d ("powerpc/kuap: Use ASM feature fixups instead of static branches")
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/5e0f97d5cbcd05238b56b4424ab096468296824d.1692684461.git.christophe.leroy@csgroup.eu
parent 429356fa

arch/powerpc/include/asm/mmu.h

+0 −5
Original line number Diff line number Diff line
@@ -144,11 +144,6 @@ 


typedef pte_t *pgtable_t;



#ifdef CONFIG_PPC_E500

#include <asm/percpu.h>

DECLARE_PER_CPU(int, next_tlbcam_idx);

#endif



enum {

	MMU_FTRS_POSSIBLE =

#if defined(CONFIG_PPC_BOOK3S_604)

arch/powerpc/include/asm/nohash/mmu-e500.h

+3 −0
Original line number Diff line number Diff line
@@ -319,6 +319,9 @@ extern int book3e_htw_mode; 


#endif



#include <asm/percpu.h>

DECLARE_PER_CPU(int, next_tlbcam_idx);



#endif /* !__ASSEMBLY__ */



#endif /* _ASM_POWERPC_MMU_BOOK3E_H_ */