Pass the page->flags to this function instead of the struct page.
This is in preparation for splitting struct page into separate types.
Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
---
include/asm-generic/memory_model.h | 2 +-
include/linux/mm.h | 4 ++--
mm/sparse.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/asm-generic/memory_model.h b/include/asm-generic/memory_model.h
index a2c8ed60233a..ee9c285f5af2 100644
--- a/include/asm-generic/memory_model.h
+++ b/include/asm-generic/memory_model.h
@@ -32,7 +32,7 @@
*/
#define __page_to_pfn(pg) \
({ const struct page *__pg = (pg); \
- int __sec = page_to_section(__pg); \
+ int __sec = pgflags_section(__pg->flags); \
(unsigned long)(__pg - __section_mem_map_addr(__nr_to_section(__sec))); \
})
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 73a52aba448f..db63653f403c 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1553,9 +1553,9 @@ static inline void set_page_section(struct page *page, unsigned long section)
page->flags |= (section & SECTIONS_MASK) << SECTIONS_PGSHIFT;
}
-static inline unsigned long page_to_section(const struct page *page)
+static inline unsigned long pgflags_section(unsigned long pgflags)
{
- return (page->flags >> SECTIONS_PGSHIFT) & SECTIONS_MASK;
+ return (flags >> SECTIONS_PGSHIFT) & SECTIONS_MASK;
}
#endif
diff --git a/mm/sparse.c b/mm/sparse.c
index 120bc8ea5293..4c59ed8c1d5a 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -45,7 +45,7 @@ static u16 section_to_node_table[NR_MEM_SECTIONS] __cacheline_aligned;
int page_to_nid(const struct page *page)
{
- return section_to_node_table[page_to_section(page)];
+ return section_to_node_table[pgflags_section(page->flags)];
}
EXPORT_SYMBOL(page_to_nid);
--
2.32.0
