Skip to content

Commit

Permalink
mm/page_owner.c: modify the type of argument "order" in some functions
Browse files Browse the repository at this point in the history
The type of "order" in struct page_owner is unsigned short.
However, it is unsigned int in the following 3 functions:

  __reset_page_owner
  __set_page_owner_handle
  __set_page_owner_handle

The type of "order" in argument list is unsigned int, which is
inconsistent.

[[email protected]: update include/linux/page_owner.h]

Link: https://lkml.kernel.org/r/[email protected]
Signed-off-by: Yixuan Cao <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Cao-Wuhui authored and torvalds committed Nov 11, 2021
1 parent debe436 commit 0093de6
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions include/linux/page_owner.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,24 @@
extern struct static_key_false page_owner_inited;
extern struct page_ext_operations page_owner_ops;

extern void __reset_page_owner(struct page *page, unsigned int order);
extern void __reset_page_owner(struct page *page, unsigned short order);
extern void __set_page_owner(struct page *page,
unsigned int order, gfp_t gfp_mask);
unsigned short order, gfp_t gfp_mask);
extern void __split_page_owner(struct page *page, unsigned int nr);
extern void __folio_copy_owner(struct folio *newfolio, struct folio *old);
extern void __set_page_owner_migrate_reason(struct page *page, int reason);
extern void __dump_page_owner(const struct page *page);
extern void pagetypeinfo_showmixedcount_print(struct seq_file *m,
pg_data_t *pgdat, struct zone *zone);

static inline void reset_page_owner(struct page *page, unsigned int order)
static inline void reset_page_owner(struct page *page, unsigned short order)
{
if (static_branch_unlikely(&page_owner_inited))
__reset_page_owner(page, order);
}

static inline void set_page_owner(struct page *page,
unsigned int order, gfp_t gfp_mask)
unsigned short order, gfp_t gfp_mask)
{
if (static_branch_unlikely(&page_owner_inited))
__set_page_owner(page, order, gfp_mask);
Expand All @@ -52,15 +52,15 @@ static inline void dump_page_owner(const struct page *page)
__dump_page_owner(page);
}
#else
static inline void reset_page_owner(struct page *page, unsigned int order)
static inline void reset_page_owner(struct page *page, unsigned short order)
{
}
static inline void set_page_owner(struct page *page,
unsigned int order, gfp_t gfp_mask)
{
}
static inline void split_page_owner(struct page *page,
unsigned int order)
unsigned short order)
{
}
static inline void folio_copy_owner(struct folio *newfolio, struct folio *folio)
Expand Down
6 changes: 3 additions & 3 deletions mm/page_owner.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ static noinline depot_stack_handle_t save_stack(gfp_t flags)
return handle;
}

void __reset_page_owner(struct page *page, unsigned int order)
void __reset_page_owner(struct page *page, unsigned short order)
{
int i;
struct page_ext *page_ext;
Expand All @@ -149,7 +149,7 @@ void __reset_page_owner(struct page *page, unsigned int order)

static inline void __set_page_owner_handle(struct page_ext *page_ext,
depot_stack_handle_t handle,
unsigned int order, gfp_t gfp_mask)
unsigned short order, gfp_t gfp_mask)
{
struct page_owner *page_owner;
int i;
Expand All @@ -169,7 +169,7 @@ static inline void __set_page_owner_handle(struct page_ext *page_ext,
}
}

noinline void __set_page_owner(struct page *page, unsigned int order,
noinline void __set_page_owner(struct page *page, unsigned short order,
gfp_t gfp_mask)
{
struct page_ext *page_ext = lookup_page_ext(page);
Expand Down

0 comments on commit 0093de6

Please sign in to comment.