[PATCH v2 2/4] powerpc/mm: Rename hugetlb-radix.h to hugetlb.h

Michael Ellerman mpe at ellerman.id.au
Fri Nov 18 23:33:27 AEDT 2016


"Aneesh Kumar K.V" <aneesh.kumar at linux.vnet.ibm.com> writes:

> We will start moving some book3s specific hugetlb functions there.
>
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
> ---
>  arch/powerpc/include/asm/book3s/64/{hugetlb-radix.h => hugetlb.h} | 8 ++++++--
>  arch/powerpc/include/asm/hugetlb.h                                | 2 +-
>  2 files changed, 7 insertions(+), 3 deletions(-)
>  rename arch/powerpc/include/asm/book3s/64/{hugetlb-radix.h => hugetlb.h} (78%)
>
> diff --git a/arch/powerpc/include/asm/book3s/64/hugetlb-radix.h b/arch/powerpc/include/asm/book3s/64/hugetlb.h
> similarity index 78%
> rename from arch/powerpc/include/asm/book3s/64/hugetlb-radix.h
> rename to arch/powerpc/include/asm/book3s/64/hugetlb.h
> index c45189aa7476..d9c283f95e05 100644
> --- a/arch/powerpc/include/asm/book3s/64/hugetlb-radix.h
> +++ b/arch/powerpc/include/asm/book3s/64/hugetlb.h
> @@ -1,5 +1,5 @@
> -#ifndef _ASM_POWERPC_BOOK3S_64_HUGETLB_RADIX_H
> -#define _ASM_POWERPC_BOOK3S_64_HUGETLB_RADIX_H
> +#ifndef _ASM_POWERPC_BOOK3S_64_HUGETLB_H
> +#define _ASM_POWERPC_BOOK3S_64_HUGETLB_H
>  /*
>   * For radix we want generic code to handle hugetlb. But then if we want
>   * both hash and radix to be enabled together we need to workaround the
> @@ -21,6 +21,10 @@ static inline int hstate_get_psize(struct hstate *hstate)
>  		return MMU_PAGE_2M;
>  	else if (shift == mmu_psize_defs[MMU_PAGE_1G].shift)
>  		return MMU_PAGE_1G;
> +	else if (shift == mmu_psize_defs[MMU_PAGE_16M].shift)
> +		return MMU_PAGE_16M;
> +	else if (shift == mmu_psize_defs[MMU_PAGE_16G].shift)
> +		return MMU_PAGE_16G;

That's not just a rename?

cheers


More information about the Linuxppc-dev mailing list