From 27e23b5f5f6f22292347901303aab2a1d458bcb5 Mon Sep 17 00:00:00 2001 From: Christophe Leroy Date: Fri, 29 Mar 2019 10:00:02 +0000 Subject: [PATCH] powerpc/mm: Move nohash specifics in subdirectory mm/nohash Many files in arch/powerpc/mm are only for nohash. This patch creates a subdirectory for them. Signed-off-by: Christophe Leroy [mpe: Shorten new filenames] Signed-off-by: Michael Ellerman --- arch/powerpc/mm/Makefile | 17 +---------------- arch/powerpc/mm/{40x_mmu.c => nohash/40x.c} | 0 arch/powerpc/mm/{44x_mmu.c => nohash/44x.c} | 0 arch/powerpc/mm/{8xx_mmu.c => nohash/8xx.c} | 0 arch/powerpc/mm/nohash/Makefile | 18 ++++++++++++++++++ .../book3e_hugetlbpage.c} | 0 .../book3e_pgtable.c} | 0 .../mm/{fsl_booke_mmu.c => nohash/fsl_booke.c} | 0 .../mmu_context.c} | 0 arch/powerpc/mm/{tlb_nohash.c => nohash/tlb.c} | 0 .../mm/{tlb_nohash_low.S => nohash/tlb_low.S} | 0 arch/powerpc/mm/{ => nohash}/tlb_low_64e.S | 0 12 files changed, 19 insertions(+), 16 deletions(-) rename arch/powerpc/mm/{40x_mmu.c => nohash/40x.c} (100%) rename arch/powerpc/mm/{44x_mmu.c => nohash/44x.c} (100%) rename arch/powerpc/mm/{8xx_mmu.c => nohash/8xx.c} (100%) create mode 100644 arch/powerpc/mm/nohash/Makefile rename arch/powerpc/mm/{hugetlbpage-book3e.c => nohash/book3e_hugetlbpage.c} (100%) rename arch/powerpc/mm/{pgtable-book3e.c => nohash/book3e_pgtable.c} (100%) rename arch/powerpc/mm/{fsl_booke_mmu.c => nohash/fsl_booke.c} (100%) rename arch/powerpc/mm/{mmu_context_nohash.c => nohash/mmu_context.c} (100%) rename arch/powerpc/mm/{tlb_nohash.c => nohash/tlb.c} (100%) rename arch/powerpc/mm/{tlb_nohash_low.S => nohash/tlb_low.S} (100%) rename arch/powerpc/mm/{ => nohash}/tlb_low_64e.S (100%) 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.c similarity index 100% rename from arch/powerpc/mm/40x_mmu.c rename to arch/powerpc/mm/nohash/40x.c diff --git a/arch/powerpc/mm/44x_mmu.c b/arch/powerpc/mm/nohash/44x.c similarity index 100% rename from arch/powerpc/mm/44x_mmu.c rename to arch/powerpc/mm/nohash/44x.c diff --git a/arch/powerpc/mm/8xx_mmu.c b/arch/powerpc/mm/nohash/8xx.c similarity index 100% rename from arch/powerpc/mm/8xx_mmu.c rename to arch/powerpc/mm/nohash/8xx.c diff --git a/arch/powerpc/mm/nohash/Makefile b/arch/powerpc/mm/nohash/Makefile new file mode 100644 index 000000000000..b2228ff81b8a --- /dev/null +++ b/arch/powerpc/mm/nohash/Makefile @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: GPL-2.0 + +ccflags-$(CONFIG_PPC64) := $(NO_MINIMAL_TOC) + +obj-y += mmu_context.o tlb.o tlb_low.o +obj-$(CONFIG_PPC_BOOK3E_64) += tlb_low_64e.o book3e_pgtable.o +obj-$(CONFIG_40x) += 40x.o +obj-$(CONFIG_44x) += 44x.o +obj-$(CONFIG_PPC_8xx) += 8xx.o +obj-$(CONFIG_PPC_FSL_BOOK3E) += fsl_booke.o +ifdef CONFIG_HUGETLB_PAGE +obj-$(CONFIG_PPC_BOOK3E_MMU) += book3e_hugetlbpage.o +endif + +# Disable kcov instrumentation on sensitive code +# This is necessary for booting with kcov enabled on book3e machines +KCOV_INSTRUMENT_tlb.o := n +KCOV_INSTRUMENT_fsl_booke.o := n diff --git a/arch/powerpc/mm/hugetlbpage-book3e.c b/arch/powerpc/mm/nohash/book3e_hugetlbpage.c similarity index 100% rename from arch/powerpc/mm/hugetlbpage-book3e.c rename to arch/powerpc/mm/nohash/book3e_hugetlbpage.c diff --git a/arch/powerpc/mm/pgtable-book3e.c b/arch/powerpc/mm/nohash/book3e_pgtable.c similarity index 100% rename from arch/powerpc/mm/pgtable-book3e.c rename to arch/powerpc/mm/nohash/book3e_pgtable.c diff --git a/arch/powerpc/mm/fsl_booke_mmu.c b/arch/powerpc/mm/nohash/fsl_booke.c similarity index 100% rename from arch/powerpc/mm/fsl_booke_mmu.c rename to arch/powerpc/mm/nohash/fsl_booke.c diff --git a/arch/powerpc/mm/mmu_context_nohash.c b/arch/powerpc/mm/nohash/mmu_context.c similarity index 100% rename from arch/powerpc/mm/mmu_context_nohash.c rename to arch/powerpc/mm/nohash/mmu_context.c diff --git a/arch/powerpc/mm/tlb_nohash.c b/arch/powerpc/mm/nohash/tlb.c similarity index 100% rename from arch/powerpc/mm/tlb_nohash.c rename to arch/powerpc/mm/nohash/tlb.c diff --git a/arch/powerpc/mm/tlb_nohash_low.S b/arch/powerpc/mm/nohash/tlb_low.S similarity index 100% rename from arch/powerpc/mm/tlb_nohash_low.S rename to arch/powerpc/mm/nohash/tlb_low.S 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 -- 2.30.2