mm-dump_page-rename-head_mapcount-head_compound_mapcount.patch removed from -mm tree
The patch titled
Subject: mm, dump_page: rename head_mapcount() --> head_compound_mapcount()
has been removed from the -mm tree. Its filename was
mm-dump_page-rename-head_mapcount-head_compound_mapcount.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: John Hubbard <[email protected]>
Subject: mm, dump_page: rename head_mapcount() --> head_compound_mapcount()
Rename head_pincount() --> head_compound_pincount(). These names are more accurate (or less misleading) than the original ones.
---
include/linux/mm.h | 8 ++++---- mm/debug.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-)
include/linux/mm.h renamed from include/linux/mm.h~mm-dump_page-rename-head_mapcount-head_compound_mapcount +4 -4
@@ -791,7 +791,7 @@ static inline void *kvcalloc(size_t n, sextern void kvfree (const void *addr);extern void kvfree_sensitive (const void *addr,size_t len); -static inline int head_mapcount (struct page *head) +static inline int head_compound_mapcount (struct page *head) {return atomic_read (compound_mapcount_ptr (head)) +1 ; }
@@ -805,7 +805,7 @@ static inline int compound_mapcount(stru {VM_BUG_ON_PAGE (!PageCompound (page), page); page =compound_head (page); -return head_mapcount (page); +return head_compound_mapcount (page); }/*
@@ -918,7 +918,7 @@ static inline bool hpage_pincount_availareturn PageCompound (page) &&compound_order (page) >1 ; } -static inline int head_pincount (struct page *head) +static inline int head_compound_pincount (struct page *head) {return atomic_read (compound_pincount_ptr (head)); }
@@ -927,7 +927,7 @@ static inline int compound_pincount(stru {VM_BUG_ON_PAGE (!hpage_pincount_available (page), page); page =compound_head (page); -return head_pincount (page); +return head_compound_pincount (page); }static inline void set_compound_order (struct page *page,unsigned int order)
mm/debug.c renamed from mm/debug.c~mm-dump_page-rename-head_mapcount-head_compound_mapcount +3 -3
@@ -102,12 +102,12 @@ void __dump_page(struct page *page, consif (hpage_pincount_available (page)) {pr_warn ("head:%p order:%u compound_mapcount:%d compound_pincount:%d\n" , head,compound_order (head), -head_mapcount (head), -head_pincount (head)); +head_compound_mapcount (head), +head_compound_pincount (head)); }else {pr_warn ("head:%p order:%u compound_mapcount:%d\n" , head,compound_order (head), -head_mapcount (head)); +head_compound_mapcount (head)); } }if (PageKsm (page))
_
Patches currently in -mm which might be from [email protected] are
mm-gup_benchmark-rename-to-mm-gup_test.patch selftests-vm-use-a-common-gup_testh.patch selftests-vm-rename-run_vmtests-run_vmtestssh.patch selftests-vm-minor-cleanup-makefile-and-gup_testc.patch selftests-vm-only-some-gup_test-items-are-really-benchmarks.patch selftests-vm-gup_test-introduce-the-dump_pages-sub-test.patch selftests-vm-run_vmtestsh-update-and-clean-up-gup_test-invocation.patch selftests-vm-hmm-tests-remove-the-libhugetlbfs-dependency.patch selftests-vm-hmm-tests-remove-the-libhugetlbfs-dependency-fix.patch selftests-vm-10x-speedup-for-hmm-tests.patch