[PATCH v2 03/15] powerpc/mm: convert Book3E 64 to pte_fragment

[Christophe Leroy]

Le 26/04/2019 à 17:58, Christophe Leroy a écrit :
> Book3E 64 is the only subarch not using pte_fragment. In order
> to allow refactorisation, this patch converts it to pte_fragment.
> 
> Reviewed-by: Aneesh Kumar K.V <aneesh.kumar at linux.ibm.com>
> Signed-off-by: Christophe Leroy <christophe.leroy at c-s.fr>
> ---
>   arch/powerpc/include/asm/mmu_context.h       |  6 -----
>   arch/powerpc/include/asm/nohash/64/mmu.h     |  4 +++-
>   arch/powerpc/include/asm/nohash/64/pgalloc.h | 33 ++++++++++------------------
>   arch/powerpc/mm/Makefile                     |  4 ++--
>   arch/powerpc/mm/mmu_context.c                |  2 +-
>   5 files changed, 18 insertions(+), 31 deletions(-)
> 
[...]

> diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile
> index 3c1bd9fa23cd..138c772d58d1 100644
> --- a/arch/powerpc/mm/Makefile
> +++ b/arch/powerpc/mm/Makefile
> @@ -9,6 +9,7 @@ CFLAGS_REMOVE_slb.o = $(CC_FLAGS_FTRACE)
>   
>   obj-y				:= fault.o mem.o pgtable.o mmap.o \
>   				   init_$(BITS).o pgtable_$(BITS).o \
> +				   pgtable-frag.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
> @@ -17,8 +18,7 @@ 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_PPC32)		+= pgtable-frag.o
> +				   pgtable-book3s64.o

Looks like the removal of pgtable-frag.o for CONFIG_PPC_BOOK3S_64 didn't 
survive the merge.

Will send a patch to fix that.

Christophe

>   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