mm, dump_page: rename head_mapcount() --> head_compound_mapcount() (bac3cf4d) · Commits · 戴 / test

include/linux/mm.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -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_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(struct page *page)
		{
		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_available(struct page *page)
		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));
		}
		@@ -927,7 +927,7 @@ static inline int compound_pincount(struct page *page)
		{
		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)

+3 −3

Original line number	Diff line number	Diff line
		@@ -102,12 +102,12 @@ void __dump_page(struct page page, const char reason)
		if (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))