The patch titled Subject: ia64: switch to generic version of pte allocation has been added to the -mm tree. Its filename is ia64-switch-to-generic-version-of-pte-allocation.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/ia64-switch-to-generic-version-of-pte-allocation.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/ia64-switch-to-generic-version-of-pte-allocation.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 Rapoport <rppt@xxxxxxxxxxxxx> Subject: ia64: switch to generic version of pte allocation The ia64 implementation pte_alloc_one(), pte_alloc_one_kernel(), pte_free_kernel() and pte_free() is identical to the generic except of lack of __GFP_ACCOUNT for the user PTEs allocation. Switch ia64 to use generic version of these functions. Link: http://lkml.kernel.org/r/1565250728-21721-3-git-send-email-rppt@xxxxxxxxxxxxx Signed-off-by: Mike Rapoport <rppt@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/ia64/include/asm/pgalloc.h | 32 +----------------------------- 1 file changed, 2 insertions(+), 30 deletions(-) --- a/arch/ia64/include/asm/pgalloc.h~ia64-switch-to-generic-version-of-pte-allocation +++ a/arch/ia64/include/asm/pgalloc.h @@ -20,6 +20,8 @@ #include <linux/page-flags.h> #include <linux/threads.h> +#include <asm-generic/pgalloc.h> + #include <asm/mmu_context.h> static inline pgd_t *pgd_alloc(struct mm_struct *mm) @@ -82,36 +84,6 @@ pmd_populate_kernel(struct mm_struct *mm pmd_val(*pmd_entry) = __pa(pte); } -static inline pgtable_t pte_alloc_one(struct mm_struct *mm) -{ - struct page *page; - - page = alloc_page(GFP_KERNEL | __GFP_ZERO); - if (!page) - return NULL; - if (!pgtable_page_ctor(page)) { - __free_page(page); - return NULL; - } - return page; -} - -static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm) -{ - return (pte_t *)__get_free_page(GFP_KERNEL | __GFP_ZERO); -} - -static inline void pte_free(struct mm_struct *mm, pgtable_t pte) -{ - pgtable_page_dtor(pte); - __free_page(pte); -} - -static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) -{ - free_page((unsigned long)pte); -} - #define __pte_free_tlb(tlb, pte, address) pte_free((tlb)->mm, pte) #endif /* _ASM_IA64_PGALLOC_H */ _ Patches currently in -mm which might be from rppt@xxxxxxxxxxxxx are ia64-switch-to-generic-version-of-pte-allocation.patch sh-switch-to-generic-version-of-pte-allocation.patch mm-madvise-reduce-code-duplication-in-error-handling-paths.patch