The patch titled
Subject: powerpc/mm: remove pmd_huge/pud_huge stubs and include hugetlb.h
has been added to the -mm tree. Its filename is
powerpc-mm-remove-pmd_huge-pud_huge-stubs-and-include-hugetlbh.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/powerpc-mm-remove-pmd_huge-pud_huge-stubs-and-include-hugetlbh.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/powerpc-mm-remove-pmd_huge-pud_huge-stubs-and-include-hugetlbh.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Mike Kravetz <mike.kravetz@xxxxxxxxxx>
Subject: 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 aad71e3928be
("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@xxxxxxxxxx
Signed-off-by: Mike Kravetz <mike.kravetz@xxxxxxxxxx>
Acked-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Cc: Ben Dooks <ben.dooks@xxxxxxxxxxxxxxx>
Cc: Jason Gunthorpe <jgg@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/powerpc/include/asm/book3s/64/pgtable-4k.h | 3 ---
arch/powerpc/include/asm/book3s/64/pgtable-64k.h | 3 ---
arch/powerpc/mm/book3s64/radix_pgtable.c | 1 +
3 files changed, 1 insertion(+), 6 deletions(-)
--- a/arch/powerpc/include/asm/book3s/64/pgtable-4k.h~powerpc-mm-remove-pmd_huge-pud_huge-stubs-and-include-hugetlbh
+++ a/arch/powerpc/include/asm/book3s/64/pgtable-4k.h
@@ -70,9 +70,6 @@ static inline int get_hugepd_cache_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__ */
--- a/arch/powerpc/include/asm/book3s/64/pgtable-64k.h~powerpc-mm-remove-pmd_huge-pud_huge-stubs-and-include-hugetlbh
+++ a/arch/powerpc/include/asm/book3s/64/pgtable-64k.h
@@ -59,9 +59,6 @@ static inline int get_hugepd_cache_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,
--- a/arch/powerpc/mm/book3s64/radix_pgtable.c~powerpc-mm-remove-pmd_huge-pud_huge-stubs-and-include-hugetlbh
+++ a/arch/powerpc/mm/book3s64/radix_pgtable.c
@@ -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>
_
Patches currently in -mm which might be from mike.kravetz@xxxxxxxxxx are
hugetlbfs-hugetlb_fault_mutex_hash-cleanup.patch
mm-hugetlbfs-fix-error-handling-when-setting-up-mounts.patch
powerpc-mm-remove-pmd_huge-pud_huge-stubs-and-include-hugetlbh.patch
hugetlbfs-convert-macros-to-static-inline-fix-sparse-warning.patch
