| Message ID | 12c1ba4fc9e2e55ca44c5c57225669b296d48c74.1553853405.git.christophe.leroy@c-s.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 17312f258cf6eb584f276ad592972ade7e16e318 |
| 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/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 18 lines checked |
Christophe Leroy <christophe.leroy@c-s.fr> writes: > 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> > --- > arch/powerpc/mm/Makefile | 3 +-- > arch/powerpc/mm/book3s32/Makefile | 6 ++++++ > arch/powerpc/mm/{ => book3s32}/hash_low_32.S | 0 > arch/powerpc/mm/{ => book3s32}/mmu_context_hash32.c | 0 > arch/powerpc/mm/{ => book3s32}/ppc_mmu_32.c | 0 > arch/powerpc/mm/{ => book3s32}/tlb_hash32.c | 0 > 6 files changed, 7 insertions(+), 2 deletions(-) > create mode 100644 arch/powerpc/mm/book3s32/Makefile > rename arch/powerpc/mm/{ => book3s32}/hash_low_32.S (100%) > rename arch/powerpc/mm/{ => book3s32}/mmu_context_hash32.c (100%) > rename arch/powerpc/mm/{ => book3s32}/ppc_mmu_32.c (100%) > rename arch/powerpc/mm/{ => book3s32}/tlb_hash32.c (100%) I shortened them to: arch/powerpc/mm/{hash_low_32.S => book3s32/hash_low.S} arch/powerpc/mm/{ppc_mmu_32.c => book3s32/mmu.c} arch/powerpc/mm/{mmu_context_hash32.c => book3s32/mmu_context.c} arch/powerpc/mm/{tlb_hash32.c => book3s32/tlb.c} cheers
Le 02/05/2019 à 13:32, Michael Ellerman a écrit : > Christophe Leroy <christophe.leroy@c-s.fr> writes: > >> 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> >> --- >> arch/powerpc/mm/Makefile | 3 +-- >> arch/powerpc/mm/book3s32/Makefile | 6 ++++++ >> arch/powerpc/mm/{ => book3s32}/hash_low_32.S | 0 >> arch/powerpc/mm/{ => book3s32}/mmu_context_hash32.c | 0 >> arch/powerpc/mm/{ => book3s32}/ppc_mmu_32.c | 0 >> arch/powerpc/mm/{ => book3s32}/tlb_hash32.c | 0 >> 6 files changed, 7 insertions(+), 2 deletions(-) >> create mode 100644 arch/powerpc/mm/book3s32/Makefile >> rename arch/powerpc/mm/{ => book3s32}/hash_low_32.S (100%) >> rename arch/powerpc/mm/{ => book3s32}/mmu_context_hash32.c (100%) >> rename arch/powerpc/mm/{ => book3s32}/ppc_mmu_32.c (100%) >> rename arch/powerpc/mm/{ => book3s32}/tlb_hash32.c (100%) > > I shortened them to: > > arch/powerpc/mm/{hash_low_32.S => book3s32/hash_low.S} > arch/powerpc/mm/{ppc_mmu_32.c => book3s32/mmu.c} To be consistent with what you did in nohash/ dir, shouldn't we rename the above 'ppc.c' or 'ppc_32.c' instead of 'mmu.c' ? Christophe > arch/powerpc/mm/{mmu_context_hash32.c => book3s32/mmu_context.c} > arch/powerpc/mm/{tlb_hash32.c => book3s32/tlb.c} > > cheers >
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..7f2690d319fd --- /dev/null +++ b/arch/powerpc/mm/book3s32/Makefile @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for the linux ppc-specific parts of the memory manager. +# + +obj-y += ppc_mmu_32.o hash_low_32.o mmu_context_hash32.o tlb_hash32.o diff --git a/arch/powerpc/mm/hash_low_32.S b/arch/powerpc/mm/book3s32/hash_low_32.S similarity index 100% rename from arch/powerpc/mm/hash_low_32.S rename to arch/powerpc/mm/book3s32/hash_low_32.S diff --git a/arch/powerpc/mm/mmu_context_hash32.c b/arch/powerpc/mm/book3s32/mmu_context_hash32.c similarity index 100% rename from arch/powerpc/mm/mmu_context_hash32.c rename to arch/powerpc/mm/book3s32/mmu_context_hash32.c diff --git a/arch/powerpc/mm/ppc_mmu_32.c b/arch/powerpc/mm/book3s32/ppc_mmu_32.c similarity index 100% rename from arch/powerpc/mm/ppc_mmu_32.c rename to arch/powerpc/mm/book3s32/ppc_mmu_32.c diff --git a/arch/powerpc/mm/tlb_hash32.c b/arch/powerpc/mm/book3s32/tlb_hash32.c similarity index 100% rename from arch/powerpc/mm/tlb_hash32.c rename to arch/powerpc/mm/book3s32/tlb_hash32.c
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> --- arch/powerpc/mm/Makefile | 3 +-- arch/powerpc/mm/book3s32/Makefile | 6 ++++++ arch/powerpc/mm/{ => book3s32}/hash_low_32.S | 0 arch/powerpc/mm/{ => book3s32}/mmu_context_hash32.c | 0 arch/powerpc/mm/{ => book3s32}/ppc_mmu_32.c | 0 arch/powerpc/mm/{ => book3s32}/tlb_hash32.c | 0 6 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 arch/powerpc/mm/book3s32/Makefile rename arch/powerpc/mm/{ => book3s32}/hash_low_32.S (100%) rename arch/powerpc/mm/{ => book3s32}/mmu_context_hash32.c (100%) rename arch/powerpc/mm/{ => book3s32}/ppc_mmu_32.c (100%) rename arch/powerpc/mm/{ => book3s32}/tlb_hash32.c (100%)