| Message ID | 20200803135447.3833067d@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | powerpc: fix up PPC_FSL_BOOK3E build | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (14fd53d1e5ee7350564cac75e336f8c0dea13bc9) |
| snowpatch_ozlabs/build-ppc64le | warning | Upstream build failed, couldn't test patch |
| snowpatch_ozlabs/build-ppc64be | warning | Upstream build failed, couldn't test patch |
| snowpatch_ozlabs/build-ppc64e | warning | Upstream build failed, couldn't test patch |
| snowpatch_ozlabs/build-pmac32 | warning | Upstream build failed, couldn't test patch |
| snowpatch_ozlabs/checkpatch | warning | total: 1 errors, 1 warnings, 0 checks, 49 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
Hi all, On Mon, 3 Aug 2020 13:54:47 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Commit > > 1c9df907da83 ("random: fix circular include dependency on arm64 after addition of percpu.h") > > exposed a curcular include dependency: > > asm/mmu.h includes asm/percpu.h, which includes asm/paca.h, which > includes asm/mmu.h > > So fix it by extracting the small part of asm/mmu.h that needs > asm/percu.h into a new file and including that where necessary. > > Cc: Willy Tarreau <w@1wt.eu> > Cc: <stable@kernel.org> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> I should have put: Fixes: 1c9df907da83 ("random: fix circular include dependency on arm64 after addition of percpu.h")
diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h index f4ac25d4df05..fa602a4cf303 100644 --- a/arch/powerpc/include/asm/mmu.h +++ b/arch/powerpc/include/asm/mmu.h @@ -134,11 +134,6 @@ typedef pte_t *pgtable_t; -#ifdef CONFIG_PPC_FSL_BOOK3E -#include <asm/percpu.h> -DECLARE_PER_CPU(int, next_tlbcam_idx); -#endif - enum { MMU_FTRS_POSSIBLE = #ifdef CONFIG_PPC_BOOK3S diff --git a/arch/powerpc/include/asm/mmu_fsl_e.h b/arch/powerpc/include/asm/mmu_fsl_e.h new file mode 100644 index 000000000000..c74a81556ce5 --- /dev/null +++ b/arch/powerpc/include/asm/mmu_fsl_e.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_POWERPC_MMU_FSL_E_H_ +#define _ASM_POWERPC_MMU_FSL_E_H_ + +#ifdef CONFIG_PPC_FSL_BOOK3E +#include <asm/percpu.h> +DECLARE_PER_CPU(int, next_tlbcam_idx); +#endif + +#endif diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index 73199470c265..142b3e7882bf 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c @@ -35,6 +35,7 @@ #include <linux/stackprotector.h> #include <linux/pgtable.h> +#include <asm/mmu_fsl_e.h> #include <asm/ptrace.h> #include <linux/atomic.h> #include <asm/irq.h> diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index c2c11eb8dcfc..7371061b2126 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c @@ -37,6 +37,7 @@ #include <asm/pgalloc.h> #include <asm/prom.h> #include <asm/io.h> +#include <asm/mmu_fsl_e.h> #include <asm/mmu_context.h> #include <asm/mmu.h> #include <asm/smp.h> diff --git a/arch/powerpc/mm/nohash/book3e_hugetlbpage.c b/arch/powerpc/mm/nohash/book3e_hugetlbpage.c index 8b88be91b622..cacda4ee5da5 100644 --- a/arch/powerpc/mm/nohash/book3e_hugetlbpage.c +++ b/arch/powerpc/mm/nohash/book3e_hugetlbpage.c @@ -9,6 +9,7 @@ #include <linux/mm.h> #include <linux/hugetlb.h> +#include <asm/mmu_fsl_e.h> #include <asm/mmu.h> #ifdef CONFIG_PPC64 diff --git a/arch/powerpc/mm/nohash/tlb.c b/arch/powerpc/mm/nohash/tlb.c index 696f568253a0..8b3a68ce7fde 100644 --- a/arch/powerpc/mm/nohash/tlb.c +++ b/arch/powerpc/mm/nohash/tlb.c @@ -171,6 +171,7 @@ int extlb_level_exc; #endif /* CONFIG_PPC64 */ #ifdef CONFIG_PPC_FSL_BOOK3E +#include <asm/mmu_fsl_e.h> /* next_tlbcam_idx is used to round-robin tlbcam entry assignment */ DEFINE_PER_CPU(int, next_tlbcam_idx); EXPORT_PER_CPU_SYMBOL(next_tlbcam_idx);
Commit 1c9df907da83 ("random: fix circular include dependency on arm64 after addition of percpu.h") exposed a curcular include dependency: asm/mmu.h includes asm/percpu.h, which includes asm/paca.h, which includes asm/mmu.h So fix it by extracting the small part of asm/mmu.h that needs asm/percu.h into a new file and including that where necessary. Cc: Willy Tarreau <w@1wt.eu> Cc: <stable@kernel.org> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- I have done powerpc test builds of allmodconfig, ppc64e_defconfig and corenet64_smp_defconfig. arch/powerpc/include/asm/mmu.h | 5 ----- arch/powerpc/include/asm/mmu_fsl_e.h | 10 ++++++++++ arch/powerpc/kernel/smp.c | 1 + arch/powerpc/mm/mem.c | 1 + arch/powerpc/mm/nohash/book3e_hugetlbpage.c | 1 + arch/powerpc/mm/nohash/tlb.c | 1 + 6 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 arch/powerpc/include/asm/mmu_fsl_e.h