| Message ID | a87606761d285e4f3dee5c2de1e6691f04e429b6.1553853405.git.christophe.leroy@c-s.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 27e23b5f5f6f22292347901303aab2a1d458bcb5 |
| Headers | show |
| Series | powerpc: Split arch/powerpc/mm/ directory | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch next (9e98c678c2d6ae3a17cb2de55d17f69dddaa231b) |
| snowpatch_ozlabs/build-ppc64le | success | Build succeeded and removed 11 sparse warnings |
| snowpatch_ozlabs/build-ppc64be | success | Build succeeded and removed 11 sparse warnings |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded and removed 5 sparse warnings |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded and removed 3 sparse warnings |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 47 lines checked |
Christophe Leroy <christophe.leroy@c-s.fr> writes: > Many files in arch/powerpc/mm are only for nohash. This patch > creates a subdirectory for them. > > Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> > --- > arch/powerpc/mm/Makefile | 17 +---------------- > arch/powerpc/mm/{ => nohash}/40x_mmu.c | 0 > arch/powerpc/mm/{ => nohash}/44x_mmu.c | 0 > arch/powerpc/mm/{ => nohash}/8xx_mmu.c | 0 > arch/powerpc/mm/nohash/Makefile | 21 +++++++++++++++++++++ > arch/powerpc/mm/{ => nohash}/fsl_booke_mmu.c | 0 > arch/powerpc/mm/{ => nohash}/hugetlbpage-book3e.c | 0 > arch/powerpc/mm/{ => nohash}/mmu_context_nohash.c | 0 > arch/powerpc/mm/{ => nohash}/pgtable-book3e.c | 0 > arch/powerpc/mm/{ => nohash}/tlb_low_64e.S | 0 > arch/powerpc/mm/{ => nohash}/tlb_nohash.c | 0 > arch/powerpc/mm/{ => nohash}/tlb_nohash_low.S | 0 > 12 files changed, 22 insertions(+), 16 deletions(-) > rename arch/powerpc/mm/{ => nohash}/40x_mmu.c (100%) > rename arch/powerpc/mm/{ => nohash}/44x_mmu.c (100%) > rename arch/powerpc/mm/{ => nohash}/8xx_mmu.c (100%) > create mode 100644 arch/powerpc/mm/nohash/Makefile > rename arch/powerpc/mm/{ => nohash}/fsl_booke_mmu.c (100%) > rename arch/powerpc/mm/{ => nohash}/hugetlbpage-book3e.c (100%) > rename arch/powerpc/mm/{ => nohash}/mmu_context_nohash.c (100%) > rename arch/powerpc/mm/{ => nohash}/pgtable-book3e.c (100%) > rename arch/powerpc/mm/{ => nohash}/tlb_low_64e.S (100%) > rename arch/powerpc/mm/{ => nohash}/tlb_nohash.c (100%) > rename arch/powerpc/mm/{ => nohash}/tlb_nohash_low.S (100%) I went with: arch/powerpc/mm/{40x_mmu.c => nohash/40x.c} arch/powerpc/mm/{44x_mmu.c => nohash/44x.c} arch/powerpc/mm/{8xx_mmu.c => nohash/8xx.c} arch/powerpc/mm/{hugetlbpage-book3e.c => nohash/book3e_hugetlbpage.c} arch/powerpc/mm/{pgtable-book3e.c => nohash/book3e_pgtable.c} arch/powerpc/mm/{fsl_booke_mmu.c => nohash/fsl_booke.c} arch/powerpc/mm/{mmu_context_nohash.c => nohash/mmu_context.c} arch/powerpc/mm/{tlb_nohash.c => nohash/tlb.c} arch/powerpc/mm/{tlb_nohash_low.S => nohash/tlb_low.S} arch/powerpc/mm/{ => nohash}/tlb_low_64e.S cheers
diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile index 68cb1e840b5e..08557bae6fa1 100644 --- a/arch/powerpc/mm/Makefile +++ b/arch/powerpc/mm/Makefile @@ -8,30 +8,15 @@ ccflags-$(CONFIG_PPC64) := $(NO_MINIMAL_TOC) obj-y := fault.o mem.o pgtable.o mmap.o \ init_$(BITS).o pgtable_$(BITS).o \ init-common.o mmu_context.o drmem.o -obj-$(CONFIG_PPC_MMU_NOHASH) += mmu_context_nohash.o tlb_nohash.o \ - tlb_nohash_low.o -obj-$(CONFIG_PPC_BOOK3E) += tlb_low_$(BITS)e.o -obj-$(CONFIG_PPC_BOOK3E_64) += pgtable-book3e.o +obj-$(CONFIG_PPC_MMU_NOHASH) += nohash/ obj-$(CONFIG_PPC_BOOK3S_32) += book3s32/ obj-$(CONFIG_PPC_BOOK3S_64) += book3s64/ obj-$(CONFIG_PPC_BOOK3S_64) += pgtable-frag.o obj-$(CONFIG_PPC32) += pgtable-frag.o -obj-$(CONFIG_40x) += 40x_mmu.o -obj-$(CONFIG_44x) += 44x_mmu.o -obj-$(CONFIG_PPC_8xx) += 8xx_mmu.o -obj-$(CONFIG_PPC_FSL_BOOK3E) += fsl_booke_mmu.o obj-$(CONFIG_NEED_MULTIPLE_NODES) += numa.o obj-$(CONFIG_PPC_MM_SLICES) += slice.o obj-y += hugetlbpage.o -ifdef CONFIG_HUGETLB_PAGE -obj-$(CONFIG_PPC_BOOK3E_MMU) += hugetlbpage-book3e.o -endif obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-noncoherent.o obj-$(CONFIG_HIGHMEM) += highmem.o obj-$(CONFIG_PPC_COPRO_BASE) += copro_fault.o obj-$(CONFIG_PPC_PTDUMP) += ptdump/ - -# Disable kcov instrumentation on sensitive code -# This is necessary for booting with kcov enabled on book3e machines -KCOV_INSTRUMENT_tlb_nohash.o := n -KCOV_INSTRUMENT_fsl_booke_mmu.o := n diff --git a/arch/powerpc/mm/40x_mmu.c b/arch/powerpc/mm/nohash/40x_mmu.c similarity index 100% rename from arch/powerpc/mm/40x_mmu.c rename to arch/powerpc/mm/nohash/40x_mmu.c diff --git a/arch/powerpc/mm/44x_mmu.c b/arch/powerpc/mm/nohash/44x_mmu.c similarity index 100% rename from arch/powerpc/mm/44x_mmu.c rename to arch/powerpc/mm/nohash/44x_mmu.c diff --git a/arch/powerpc/mm/8xx_mmu.c b/arch/powerpc/mm/nohash/8xx_mmu.c similarity index 100% rename from arch/powerpc/mm/8xx_mmu.c rename to arch/powerpc/mm/nohash/8xx_mmu.c diff --git a/arch/powerpc/mm/nohash/Makefile b/arch/powerpc/mm/nohash/Makefile new file mode 100644 index 000000000000..f9f5161fd487 --- /dev/null +++ b/arch/powerpc/mm/nohash/Makefile @@ -0,0 +1,21 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for the linux ppc-specific parts of the memory manager. +# + +ccflags-$(CONFIG_PPC64) := $(NO_MINIMAL_TOC) + +obj-y += mmu_context_nohash.o tlb_nohash.o tlb_nohash_low.o +obj-$(CONFIG_PPC_BOOK3E_64) += tlb_low_64e.o pgtable-book3e.o +obj-$(CONFIG_40x) += 40x_mmu.o +obj-$(CONFIG_44x) += 44x_mmu.o +obj-$(CONFIG_PPC_8xx) += 8xx_mmu.o +obj-$(CONFIG_PPC_FSL_BOOK3E) += fsl_booke_mmu.o +ifdef CONFIG_HUGETLB_PAGE +obj-$(CONFIG_PPC_BOOK3E_MMU) += hugetlbpage-book3e.o +endif + +# Disable kcov instrumentation on sensitive code +# This is necessary for booting with kcov enabled on book3e machines +KCOV_INSTRUMENT_tlb_nohash.o := n +KCOV_INSTRUMENT_fsl_booke_mmu.o := n diff --git a/arch/powerpc/mm/fsl_booke_mmu.c b/arch/powerpc/mm/nohash/fsl_booke_mmu.c similarity index 100% rename from arch/powerpc/mm/fsl_booke_mmu.c rename to arch/powerpc/mm/nohash/fsl_booke_mmu.c diff --git a/arch/powerpc/mm/hugetlbpage-book3e.c b/arch/powerpc/mm/nohash/hugetlbpage-book3e.c similarity index 100% rename from arch/powerpc/mm/hugetlbpage-book3e.c rename to arch/powerpc/mm/nohash/hugetlbpage-book3e.c diff --git a/arch/powerpc/mm/mmu_context_nohash.c b/arch/powerpc/mm/nohash/mmu_context_nohash.c similarity index 100% rename from arch/powerpc/mm/mmu_context_nohash.c rename to arch/powerpc/mm/nohash/mmu_context_nohash.c diff --git a/arch/powerpc/mm/pgtable-book3e.c b/arch/powerpc/mm/nohash/pgtable-book3e.c similarity index 100% rename from arch/powerpc/mm/pgtable-book3e.c rename to arch/powerpc/mm/nohash/pgtable-book3e.c diff --git a/arch/powerpc/mm/tlb_low_64e.S b/arch/powerpc/mm/nohash/tlb_low_64e.S similarity index 100% rename from arch/powerpc/mm/tlb_low_64e.S rename to arch/powerpc/mm/nohash/tlb_low_64e.S diff --git a/arch/powerpc/mm/tlb_nohash.c b/arch/powerpc/mm/nohash/tlb_nohash.c similarity index 100% rename from arch/powerpc/mm/tlb_nohash.c rename to arch/powerpc/mm/nohash/tlb_nohash.c diff --git a/arch/powerpc/mm/tlb_nohash_low.S b/arch/powerpc/mm/nohash/tlb_nohash_low.S similarity index 100% rename from arch/powerpc/mm/tlb_nohash_low.S rename to arch/powerpc/mm/nohash/tlb_nohash_low.S
Many files in arch/powerpc/mm are only for nohash. This patch creates a subdirectory for them. Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> --- arch/powerpc/mm/Makefile | 17 +---------------- arch/powerpc/mm/{ => nohash}/40x_mmu.c | 0 arch/powerpc/mm/{ => nohash}/44x_mmu.c | 0 arch/powerpc/mm/{ => nohash}/8xx_mmu.c | 0 arch/powerpc/mm/nohash/Makefile | 21 +++++++++++++++++++++ arch/powerpc/mm/{ => nohash}/fsl_booke_mmu.c | 0 arch/powerpc/mm/{ => nohash}/hugetlbpage-book3e.c | 0 arch/powerpc/mm/{ => nohash}/mmu_context_nohash.c | 0 arch/powerpc/mm/{ => nohash}/pgtable-book3e.c | 0 arch/powerpc/mm/{ => nohash}/tlb_low_64e.S | 0 arch/powerpc/mm/{ => nohash}/tlb_nohash.c | 0 arch/powerpc/mm/{ => nohash}/tlb_nohash_low.S | 0 12 files changed, 22 insertions(+), 16 deletions(-) rename arch/powerpc/mm/{ => nohash}/40x_mmu.c (100%) rename arch/powerpc/mm/{ => nohash}/44x_mmu.c (100%) rename arch/powerpc/mm/{ => nohash}/8xx_mmu.c (100%) create mode 100644 arch/powerpc/mm/nohash/Makefile rename arch/powerpc/mm/{ => nohash}/fsl_booke_mmu.c (100%) rename arch/powerpc/mm/{ => nohash}/hugetlbpage-book3e.c (100%) rename arch/powerpc/mm/{ => nohash}/mmu_context_nohash.c (100%) rename arch/powerpc/mm/{ => nohash}/pgtable-book3e.c (100%) rename arch/powerpc/mm/{ => nohash}/tlb_low_64e.S (100%) rename arch/powerpc/mm/{ => nohash}/tlb_nohash.c (100%) rename arch/powerpc/mm/{ => nohash}/tlb_nohash_low.S (100%)