Commit ca891f41 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Linus Torvalds
Browse files

mm: constify get_pfnblock_flags_mask and get_pfnblock_migratetype 

The struct page is not modified by these routines, so it can be marked
const.

Link: https://lkml.kernel.org/r/20210416231531.2521383-6-willy@infradead.org


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarVlastimil Babka <vbabka@suse.cz>
Reviewed-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Reviewed-by: default avatarWilliam Kucharski <william.kucharski@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0f2317e3

include/linux/pageblock-flags.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ extern unsigned int pageblock_order; 
/* Forward declaration */

struct page;



unsigned long get_pfnblock_flags_mask(struct page *page,

unsigned long get_pfnblock_flags_mask(const struct page *page,

				unsigned long pfn,

				unsigned long mask);

mm/page_alloc.c

+7 −6
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ static inline bool defer_init(int nid, unsigned long pfn, unsigned long end_pfn) 
#endif



/* Return a pointer to the bitmap storing bits affecting a block of pages */

static inline unsigned long *get_pageblock_bitmap(struct page *page,

static inline unsigned long *get_pageblock_bitmap(const struct page *page,

							unsigned long pfn)

{

#ifdef CONFIG_SPARSEMEM
@@ -484,7 +484,7 @@ static inline unsigned long *get_pageblock_bitmap(struct page *page, 
#endif /* CONFIG_SPARSEMEM */

}



static inline int pfn_to_bitidx(struct page *page, unsigned long pfn)

static inline int pfn_to_bitidx(const struct page *page, unsigned long pfn)

{

#ifdef CONFIG_SPARSEMEM

	pfn &= (PAGES_PER_SECTION-1);
@@ -495,7 +495,7 @@ static inline int pfn_to_bitidx(struct page *page, unsigned long pfn) 
}



static __always_inline

unsigned long __get_pfnblock_flags_mask(struct page *page,

unsigned long __get_pfnblock_flags_mask(const struct page *page,

					unsigned long pfn,

					unsigned long mask)

{
@@ -520,13 +520,14 @@ unsigned long __get_pfnblock_flags_mask(struct page *page, 
 *

 * Return: pageblock_bits flags

 */

unsigned long get_pfnblock_flags_mask(struct page *page, unsigned long pfn,

					unsigned long mask)

unsigned long get_pfnblock_flags_mask(const struct page *page,

					unsigned long pfn, unsigned long mask)

{

	return __get_pfnblock_flags_mask(page, pfn, mask);

}



static __always_inline int get_pfnblock_migratetype(struct page *page, unsigned long pfn)

static __always_inline int get_pfnblock_migratetype(const struct page *page,

					unsigned long pfn)

{

	return __get_pfnblock_flags_mask(page, pfn, MIGRATETYPE_MASK);

}