Commit 47d99948 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/mm: Move book3s64 specifics in subdirectory mm/book3s64 



Many files in arch/powerpc/mm are only for book3S64. This patch
creates a subdirectory for them.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
[mpe: Update the selftest sym links, shorten new filenames, cleanup some
      whitespace and formatting in the new files.]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 9d9f2ccc

arch/powerpc/mm/Makefile

+3 −22
Original line number Diff line number Diff line
@@ -5,53 +5,34 @@ 


ccflags-$(CONFIG_PPC64)	:= $(NO_MINIMAL_TOC)



CFLAGS_REMOVE_slb.o = $(CC_FLAGS_FTRACE)



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

hash64-$(CONFIG_PPC_NATIVE)	:= hash_native_64.o

obj-$(CONFIG_PPC_BOOK3E_64)   += pgtable-book3e.o

obj-$(CONFIG_PPC_BOOK3S_64)	+= pgtable-hash64.o hash_utils_64.o slb.o \

				   $(hash64-y) mmu_context_book3s64.o \

				   pgtable-book3s64.o pgtable-frag.o

obj-$(CONFIG_PPC_BOOK3S_64)	+= book3s64/

obj-$(CONFIG_PPC_BOOK3S_64)	+= pgtable-frag.o

obj-$(CONFIG_PPC32)		+= pgtable-frag.o

obj-$(CONFIG_PPC_RADIX_MMU)	+= pgtable-radix.o tlb-radix.o

obj-$(CONFIG_PPC_BOOK3S_32)	+= ppc_mmu_32.o hash_low_32.o mmu_context_hash32.o

obj-$(CONFIG_PPC_BOOK3S)	+= tlb_hash$(BITS).o

ifdef CONFIG_PPC_BOOK3S_64

obj-$(CONFIG_PPC_4K_PAGES)	+= hash64_4k.o

obj-$(CONFIG_PPC_64K_PAGES)	+= hash64_64k.o

endif

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

obj-$(CONFIG_PPC_FSL_BOOK3E)	+= fsl_booke_mmu.o

obj-$(CONFIG_NEED_MULTIPLE_NODES) += numa.o

obj-$(CONFIG_PPC_SPLPAR)	+= vphn.o

obj-$(CONFIG_PPC_MM_SLICES)	+= slice.o

obj-y				+= hugetlbpage.o

ifdef CONFIG_HUGETLB_PAGE

obj-$(CONFIG_PPC_BOOK3S_64)	+= hugetlbpage-hash64.o

obj-$(CONFIG_PPC_RADIX_MMU)	+= hugetlbpage-radix.o

obj-$(CONFIG_PPC_BOOK3E_MMU)	+= hugetlbpage-book3e.o

endif

obj-$(CONFIG_TRANSPARENT_HUGEPAGE) += hugepage-hash64.o

obj-$(CONFIG_PPC_SUBPAGE_PROT)	+= subpage-prot.o

obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-noncoherent.o

obj-$(CONFIG_HIGHMEM)		+= highmem.o

obj-$(CONFIG_PPC_COPRO_BASE)	+= copro_fault.o

obj-$(CONFIG_SPAPR_TCE_IOMMU)	+= mmu_context_iommu.o

obj-$(CONFIG_PPC_PTDUMP)	+= ptdump/

obj-$(CONFIG_PPC_MEM_KEYS)	+= pkeys.o



# 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
 


# Instrumenting the SLB fault path can lead to duplicate SLB entries

KCOV_INSTRUMENT_slb.o := n

arch/powerpc/mm/book3s64/Makefile

0 → 100644
+24 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



ccflags-y	:= $(NO_MINIMAL_TOC)



CFLAGS_REMOVE_slb.o = $(CC_FLAGS_FTRACE)



obj-y				+= hash_pgtable.o hash_utils.o slb.o \

				   mmu_context.o pgtable.o hash_tlb.o

obj-$(CONFIG_PPC_NATIVE)	+= hash_native.o

obj-$(CONFIG_PPC_RADIX_MMU)	+= radix_pgtable.o radix_tlb.o

obj-$(CONFIG_PPC_4K_PAGES)	+= hash_4k.o

obj-$(CONFIG_PPC_64K_PAGES)	+= hash_64k.o

obj-$(CONFIG_PPC_SPLPAR)	+= vphn.o

obj-$(CONFIG_HUGETLB_PAGE)	+= hash_hugetlbpage.o

ifdef CONFIG_HUGETLB_PAGE

obj-$(CONFIG_PPC_RADIX_MMU)	+= radix_hugetlbpage.o

endif

obj-$(CONFIG_TRANSPARENT_HUGEPAGE) += hash_hugepage.o

obj-$(CONFIG_PPC_SUBPAGE_PROT)	+= subpage_prot.o

obj-$(CONFIG_SPAPR_TCE_IOMMU)	+= iommu_api.o

obj-$(CONFIG_PPC_MEM_KEYS)	+= pkeys.o



# Instrumenting the SLB fault path can lead to duplicate SLB entries

KCOV_INSTRUMENT_slb.o := n

arch/powerpc/mm/hash64_4k.c→arch/powerpc/mm/book3s64/hash_4k.c

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright IBM Corporation, 2015

 * Author Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>

 * Author Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of version 2 of the GNU Lesser General Public License

arch/powerpc/mm/hash64_64k.c→arch/powerpc/mm/book3s64/hash_64k.c

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright IBM Corporation, 2015

 * Author Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>

 * Author Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of version 2 of the GNU Lesser General Public License

arch/powerpc/mm/hugepage-hash64.c→arch/powerpc/mm/book3s64/hash_hugepage.c

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright IBM Corporation, 2013

 * Author Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>

 * Author Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of version 2.1 of the GNU Lesser General Public License