Subject: [merged] mn10300-add-missing-pgtable_page_ctor-dtor-calls.patch removed from -mm tree To: kirill.shutemov@xxxxxxxxxxxxxxx,dhowells@xxxxxxxxxx,yasutake.koichi@xxxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Fri, 15 Nov 2013 12:07:52 -0800 The patch titled Subject: mn10300: add missing pgtable_page_ctor/dtor calls has been removed from the -mm tree. Its filename was mn10300-add-missing-pgtable_page_ctor-dtor-calls.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: "Kirill A. Shutemov" <kirill.shutemov@xxxxxxxxxxxxxxx> Subject: mn10300: add missing pgtable_page_ctor/dtor calls It will fix NR_PAGETABLE accounting. It's also required if the arch is going ever support split ptl. Signed-off-by: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx> Acked-by: David Howells <dhowells@xxxxxxxxxx> Cc: Koichi Yasutake <yasutake.koichi@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/mn10300/include/asm/pgalloc.h | 1 + arch/mn10300/mm/pgtable.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff -puN arch/mn10300/include/asm/pgalloc.h~mn10300-add-missing-pgtable_page_ctor-dtor-calls arch/mn10300/include/asm/pgalloc.h --- a/arch/mn10300/include/asm/pgalloc.h~mn10300-add-missing-pgtable_page_ctor-dtor-calls +++ a/arch/mn10300/include/asm/pgalloc.h @@ -46,6 +46,7 @@ static inline void pte_free_kernel(struc static inline void pte_free(struct mm_struct *mm, struct page *pte) { + pgtable_page_dtor(pte); __free_page(pte); } diff -puN arch/mn10300/mm/pgtable.c~mn10300-add-missing-pgtable_page_ctor-dtor-calls arch/mn10300/mm/pgtable.c --- a/arch/mn10300/mm/pgtable.c~mn10300-add-missing-pgtable_page_ctor-dtor-calls +++ a/arch/mn10300/mm/pgtable.c @@ -78,8 +78,13 @@ struct page *pte_alloc_one(struct mm_str #else pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT, 0); #endif - if (pte) - clear_highpage(pte); + if (!pte) + return NULL; + clear_highpage(pte); + if (!pgtable_page_ctor(pte)) { + __free_page(pte); + return NULL; + } return pte; } _ Patches currently in -mm which might be from kirill.shutemov@xxxxxxxxxxxxxxx are origin.patch x86-mm-get-aslr-work-for-hugetlb-mappings.patch mm-drop-actor-argument-of-do_generic_file_read-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html