From 17312f258cf6eb584f276ad592972ade7e16e318 Mon Sep 17 00:00:00 2001 From: Christophe Leroy Date: Fri, 29 Mar 2019 10:00:01 +0000 Subject: [PATCH] powerpc/mm: Move book3s32 specifics in subdirectory mm/book3s64 Several files in arch/powerpc/mm are only for book3S32. 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 | 3 +-- arch/powerpc/mm/book3s32/Makefile | 3 +++ arch/powerpc/mm/{hash_low_32.S => book3s32/hash_low.S} | 0 arch/powerpc/mm/{ppc_mmu_32.c => book3s32/mmu.c} | 0 arch/powerpc/mm/{mmu_context_hash32.c => book3s32/mmu_context.c} | 0 arch/powerpc/mm/{tlb_hash32.c => book3s32/tlb.c} | 0 6 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 arch/powerpc/mm/book3s32/Makefile rename arch/powerpc/mm/{hash_low_32.S => book3s32/hash_low.S} (100%) rename arch/powerpc/mm/{ppc_mmu_32.c => book3s32/mmu.c} (100%) rename arch/powerpc/mm/{mmu_context_hash32.c => book3s32/mmu_context.c} (100%) rename arch/powerpc/mm/{tlb_hash32.c => book3s32/tlb.c} (100%) diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile index a137fdf775e2..68cb1e840b5e 100644 --- a/arch/powerpc/mm/Makefile +++ b/arch/powerpc/mm/Makefile @@ -12,11 +12,10 @@ 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_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_PPC_BOOK3S_32) += ppc_mmu_32.o hash_low_32.o mmu_context_hash32.o -obj-$(CONFIG_PPC_BOOK3S_32) += tlb_hash32.o obj-$(CONFIG_40x) += 40x_mmu.o obj-$(CONFIG_44x) += 44x_mmu.o obj-$(CONFIG_PPC_8xx) += 8xx_mmu.o diff --git a/arch/powerpc/mm/book3s32/Makefile b/arch/powerpc/mm/book3s32/Makefile new file mode 100644 index 000000000000..a4e217d0f3b7 --- /dev/null +++ b/arch/powerpc/mm/book3s32/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-y += mmu.o hash_low.o mmu_context.o tlb.o diff --git a/arch/powerpc/mm/hash_low_32.S b/arch/powerpc/mm/book3s32/hash_low.S similarity index 100% rename from arch/powerpc/mm/hash_low_32.S rename to arch/powerpc/mm/book3s32/hash_low.S diff --git a/arch/powerpc/mm/ppc_mmu_32.c b/arch/powerpc/mm/book3s32/mmu.c similarity index 100% rename from arch/powerpc/mm/ppc_mmu_32.c rename to arch/powerpc/mm/book3s32/mmu.c diff --git a/arch/powerpc/mm/mmu_context_hash32.c b/arch/powerpc/mm/book3s32/mmu_context.c similarity index 100% rename from arch/powerpc/mm/mmu_context_hash32.c rename to arch/powerpc/mm/book3s32/mmu_context.c diff --git a/arch/powerpc/mm/tlb_hash32.c b/arch/powerpc/mm/book3s32/tlb.c similarity index 100% rename from arch/powerpc/mm/tlb_hash32.c rename to arch/powerpc/mm/book3s32/tlb.c -- 2.11.0