Commit 997cdcb0 authored by Mike Kravetz's avatar Mike Kravetz Committed by Linus Torvalds
Browse files

powerpc/mm: remove pmd_huge/pud_huge stubs and include hugetlb.h 

Patch series "hugetlbfs: convert macros to static inline, fix sparse
warning".

The definition for huge_pte_offset() in <linux/hugetlb.h> causes a
sparse warning in the !CONFIG_HUGETLB_PAGE.  Fix this as well as
converting all macros in this block of definitions to static inlines for
better type checking.

When making the above changes, build errors were found in powerpc due to
duplicate definitions.  A separate powerpc specific patch is included as
a requisite to remove the definitions and get them from
<linux/hugetlb.h>.

This patch (of 2):

This removes the power specific stubs created by commit aad71e39
("powerpc/mm: Fix build break with RADIX=y & HUGETLBFS=n") used when
!CONFIG_HUGETLB_PAGE.  Instead, it addresses the build break by getting
the definitions from <linux/hugetlb.h>.  This allows the macros in
<linux/hugetlb.h> to be replaced with static inlines.

Link: http://lkml.kernel.org/r/20191112194558.139389-2-mike.kravetz@oracle.com


Signed-off-by: default avatarMike Kravetz <mike.kravetz@oracle.com>
Acked-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Cc: Ben Dooks <ben.dooks@codethink.co.uk>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8fc312b3

arch/powerpc/include/asm/book3s/64/pgtable-4k.h

+0 −3
Original line number Diff line number Diff line
@@ -70,9 +70,6 @@ static inline int get_hugepd_cache_index(int index) 
	/* should not reach */

}



#else /* !CONFIG_HUGETLB_PAGE */

static inline int pmd_huge(pmd_t pmd) { return 0; }

static inline int pud_huge(pud_t pud) { return 0; }

#endif /* CONFIG_HUGETLB_PAGE */



#endif /* __ASSEMBLY__ */

arch/powerpc/include/asm/book3s/64/pgtable-64k.h

+0 −3
Original line number Diff line number Diff line
@@ -59,9 +59,6 @@ static inline int get_hugepd_cache_index(int index) 
	BUG();

}



#else /* !CONFIG_HUGETLB_PAGE */

static inline int pmd_huge(pmd_t pmd) { return 0; }

static inline int pud_huge(pud_t pud) { return 0; }

#endif /* CONFIG_HUGETLB_PAGE */



static inline int remap_4k_pfn(struct vm_area_struct *vma, unsigned long addr,

arch/powerpc/mm/book3s64/radix_pgtable.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/memblock.h>

#include <linux/of_fdt.h>

#include <linux/mm.h>

#include <linux/hugetlb.h>

#include <linux/string_helpers.h>

#include <linux/stop_machine.h>