Commit 535b81e2 authored by Wei Yang's avatar Wei Yang Committed by Linus Torvalds

mm/page_alloc.c: remove unnecessary end_bitidx for [set|get]_pfnblock_flags_mask()

After previous cleanup, the end_bitidx is not necessary any more.
Signed-off-by: default avatarWei Yang <richard.weiyang@linux.alibaba.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Mel Gorman <mgorman@suse.de>
Link: http://lkml.kernel.org/r/20200623124201.8199-4-richard.weiyang@linux.alibaba.comSigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d93d5ab9
...@@ -91,8 +91,7 @@ extern int page_group_by_mobility_disabled; ...@@ -91,8 +91,7 @@ extern int page_group_by_mobility_disabled;
#define MIGRATETYPE_MASK ((1UL << PB_migratetype_bits) - 1) #define MIGRATETYPE_MASK ((1UL << PB_migratetype_bits) - 1)
#define get_pageblock_migratetype(page) \ #define get_pageblock_migratetype(page) \
get_pfnblock_flags_mask(page, page_to_pfn(page), \ get_pfnblock_flags_mask(page, page_to_pfn(page), MIGRATETYPE_MASK)
PB_migrate_end, MIGRATETYPE_MASK)
struct free_area { struct free_area {
struct list_head free_list[MIGRATE_TYPES]; struct list_head free_list[MIGRATE_TYPES];
......
...@@ -56,27 +56,25 @@ struct page; ...@@ -56,27 +56,25 @@ struct page;
unsigned long get_pfnblock_flags_mask(struct page *page, unsigned long get_pfnblock_flags_mask(struct page *page,
unsigned long pfn, unsigned long pfn,
unsigned long end_bitidx,
unsigned long mask); unsigned long mask);
void set_pfnblock_flags_mask(struct page *page, void set_pfnblock_flags_mask(struct page *page,
unsigned long flags, unsigned long flags,
unsigned long pfn, unsigned long pfn,
unsigned long end_bitidx,
unsigned long mask); unsigned long mask);
/* Declarations for getting and setting flags. See mm/page_alloc.c */ /* Declarations for getting and setting flags. See mm/page_alloc.c */
#ifdef CONFIG_COMPACTION #ifdef CONFIG_COMPACTION
#define get_pageblock_skip(page) \ #define get_pageblock_skip(page) \
get_pfnblock_flags_mask(page, page_to_pfn(page), \ get_pfnblock_flags_mask(page, page_to_pfn(page), \
PB_migrate_skip, (1 << (PB_migrate_skip))) (1 << (PB_migrate_skip)))
#define clear_pageblock_skip(page) \ #define clear_pageblock_skip(page) \
set_pfnblock_flags_mask(page, 0, page_to_pfn(page), \ set_pfnblock_flags_mask(page, 0, page_to_pfn(page), \
PB_migrate_skip, (1 << PB_migrate_skip)) (1 << PB_migrate_skip))
#define set_pageblock_skip(page) \ #define set_pageblock_skip(page) \
set_pfnblock_flags_mask(page, (1 << PB_migrate_skip), \ set_pfnblock_flags_mask(page, (1 << PB_migrate_skip), \
page_to_pfn(page), \ page_to_pfn(page), \
PB_migrate_skip, (1 << PB_migrate_skip)) (1 << PB_migrate_skip))
#else #else
static inline bool get_pageblock_skip(struct page *page) static inline bool get_pageblock_skip(struct page *page)
{ {
......
...@@ -469,14 +469,13 @@ static inline int pfn_to_bitidx(struct page *page, unsigned long pfn) ...@@ -469,14 +469,13 @@ static inline int pfn_to_bitidx(struct page *page, unsigned long pfn)
* get_pfnblock_flags_mask - Return the requested group of flags for the pageblock_nr_pages block of pages * get_pfnblock_flags_mask - Return the requested group of flags for the pageblock_nr_pages block of pages
* @page: The page within the block of interest * @page: The page within the block of interest
* @pfn: The target page frame number * @pfn: The target page frame number
* @end_bitidx: The last bit of interest to retrieve
* @mask: mask of bits that the caller is interested in * @mask: mask of bits that the caller is interested in
* *
* Return: pageblock_bits flags * Return: pageblock_bits flags
*/ */
static __always_inline unsigned long __get_pfnblock_flags_mask(struct page *page, static __always_inline
unsigned long __get_pfnblock_flags_mask(struct page *page,
unsigned long pfn, unsigned long pfn,
unsigned long end_bitidx,
unsigned long mask) unsigned long mask)
{ {
unsigned long *bitmap; unsigned long *bitmap;
...@@ -493,15 +492,14 @@ static __always_inline unsigned long __get_pfnblock_flags_mask(struct page *page ...@@ -493,15 +492,14 @@ static __always_inline unsigned long __get_pfnblock_flags_mask(struct page *page
} }
unsigned long get_pfnblock_flags_mask(struct page *page, unsigned long pfn, unsigned long get_pfnblock_flags_mask(struct page *page, unsigned long pfn,
unsigned long end_bitidx,
unsigned long mask) unsigned long mask)
{ {
return __get_pfnblock_flags_mask(page, pfn, end_bitidx, 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(struct page *page, unsigned long pfn)
{ {
return __get_pfnblock_flags_mask(page, pfn, PB_migrate_end, MIGRATETYPE_MASK); return __get_pfnblock_flags_mask(page, pfn, MIGRATETYPE_MASK);
} }
/** /**
...@@ -509,12 +507,10 @@ static __always_inline int get_pfnblock_migratetype(struct page *page, unsigned ...@@ -509,12 +507,10 @@ static __always_inline int get_pfnblock_migratetype(struct page *page, unsigned
* @page: The page within the block of interest * @page: The page within the block of interest
* @flags: The flags to set * @flags: The flags to set
* @pfn: The target page frame number * @pfn: The target page frame number
* @end_bitidx: The last bit of interest
* @mask: mask of bits that the caller is interested in * @mask: mask of bits that the caller is interested in
*/ */
void set_pfnblock_flags_mask(struct page *page, unsigned long flags, void set_pfnblock_flags_mask(struct page *page, unsigned long flags,
unsigned long pfn, unsigned long pfn,
unsigned long end_bitidx,
unsigned long mask) unsigned long mask)
{ {
unsigned long *bitmap; unsigned long *bitmap;
...@@ -550,8 +546,7 @@ void set_pageblock_migratetype(struct page *page, int migratetype) ...@@ -550,8 +546,7 @@ void set_pageblock_migratetype(struct page *page, int migratetype)
migratetype = MIGRATE_UNMOVABLE; migratetype = MIGRATE_UNMOVABLE;
set_pfnblock_flags_mask(page, (unsigned long)migratetype, set_pfnblock_flags_mask(page, (unsigned long)migratetype,
page_to_pfn(page), PB_migrate_end, page_to_pfn(page), MIGRATETYPE_MASK);
MIGRATETYPE_MASK);
} }
#ifdef CONFIG_DEBUG_VM #ifdef CONFIG_DEBUG_VM
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment