p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.

Signed-off-by: John Hubbard <jhubbard@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Qian Cai <cai@lca.pw>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Mike Rapoport <rppt@linux.ibm.com>
Cc: William Kucharski <william.kucharski@oracle.com>
Link: https://lkml.kernel.org/r/20200807183358.105097-1-jhubbard@nvidia.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
John Hubbard 2020-10-13 16:51:14 -07:00 committed by Linus Torvalds
parent 853322a671
commit bac3cf4d01
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/mm.h
View File

@ -791,7 +791,7 @@ static inline void *kvcalloc(size_t n, size_t size, gfp_t flags)
extern void kvfree(const void *addr); extern void kvfree(const void *addr);
extern void kvfree_sensitive(const void *addr, size_t len); 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; return atomic_read(compound_mapcount_ptr(head)) + 1;
} }
@ -805,7 +805,7 @@ static inline int compound_mapcount(struct page *page)
{ {
VM_BUG_ON_PAGE(!PageCompound(page), page); VM_BUG_ON_PAGE(!PageCompound(page), page);
page = compound_head(page); page = compound_head(page);
return head_mapcount(page); return head_compound_mapcount(page);
} }
/* /*
@ -918,7 +918,7 @@ static inline bool hpage_pincount_available(struct page *page)
return PageCompound(page) && compound_order(page) > 1; return 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)); return atomic_read(compound_pincount_ptr(head));
} }
@ -927,7 +927,7 @@ static inline int compound_pincount(struct page *page)
{ {
VM_BUG_ON_PAGE(!hpage_pincount_available(page), page); VM_BUG_ON_PAGE(!hpage_pincount_available(page), page);
page = compound_head(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) static inline void set_compound_order(struct page *page, unsigned int order)

6
mm/debug.c
View File

@ -102,12 +102,12 @@ void __dump_page(struct page *page, const char *reason)
if (hpage_pincount_available(page)) { if (hpage_pincount_available(page)) {
pr_warn("head:%p order:%u compound_mapcount:%d compound_pincount:%d\n", pr_warn("head:%p order:%u compound_mapcount:%d compound_pincount:%d\n",
head, compound_order(head), head, compound_order(head),
head_mapcount(head), head_compound_mapcount(head),
head_pincount(head)); head_compound_pincount(head));
} else { } else {
pr_warn("head:%p order:%u compound_mapcount:%d\n", pr_warn("head:%p order:%u compound_mapcount:%d\n",
head, compound_order(head), head, compound_order(head),
head_mapcount(head)); head_compound_mapcount(head));
} }
} }
if (PageKsm(page)) if (PageKsm(page))