OSDN Git Service

powerpc/mm: Move book3s32 specifics in subdirectory mm/book3s64
authorChristophe Leroy <christophe.leroy@c-s.fr>
Fri, 29 Mar 2019 10:00:01 +0000 (10:00 +0000)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 2 May 2019 15:20:22 +0000 (01:20 +1000)
Several files in arch/powerpc/mm are only for book3S32. This patch
creates a subdirectory for them.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
[mpe: Shorten new filenames]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/mm/Makefile
arch/powerpc/mm/book3s32/Makefile [new file with mode: 0644]
arch/powerpc/mm/book3s32/hash_low.S [moved from arch/powerpc/mm/hash_low_32.S with 100% similarity]
arch/powerpc/mm/book3s32/mmu.c [moved from arch/powerpc/mm/ppc_mmu_32.c with 100% similarity]
arch/powerpc/mm/book3s32/mmu_context.c [moved from arch/powerpc/mm/mmu_context_hash32.c with 100% similarity]
arch/powerpc/mm/book3s32/tlb.c [moved from arch/powerpc/mm/tlb_hash32.c with 100% similarity]

index a137fdf..68cb1e8 100644 (file)
@@ -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 (file)
index 0000000..a4e217d
--- /dev/null
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-y += mmu.o hash_low.o mmu_context.o tlb.o