Skip to content

Commit 0093de6

Browse files
Cao-Wuhuitorvalds
authored andcommitted
mm/page_owner.c: modify the type of argument "order" in some functions
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. [akpm@linux-foundation.org: update include/linux/page_owner.h] Link: https://lkml.kernel.org/r/20211020125945.47792-1-caoyixuan2019@email.szu.edu.cn Signed-off-by: Yixuan Cao <caoyixuan2019@email.szu.edu.cn> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent debe436 commit 0093de6

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

include/linux/page_owner.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,24 @@
88
extern struct static_key_false page_owner_inited;
99
extern struct page_ext_operations page_owner_ops;
1010

11-
extern void __reset_page_owner(struct page *page, unsigned int order);
11+
extern void __reset_page_owner(struct page *page, unsigned short order);
1212
extern void __set_page_owner(struct page *page,
13-
unsigned int order, gfp_t gfp_mask);
13+
unsigned short order, gfp_t gfp_mask);
1414
extern void __split_page_owner(struct page *page, unsigned int nr);
1515
extern void __folio_copy_owner(struct folio *newfolio, struct folio *old);
1616
extern void __set_page_owner_migrate_reason(struct page *page, int reason);
1717
extern void __dump_page_owner(const struct page *page);
1818
extern void pagetypeinfo_showmixedcount_print(struct seq_file *m,
1919
pg_data_t *pgdat, struct zone *zone);
2020

21-
static inline void reset_page_owner(struct page *page, unsigned int order)
21+
static inline void reset_page_owner(struct page *page, unsigned short order)
2222
{
2323
if (static_branch_unlikely(&page_owner_inited))
2424
__reset_page_owner(page, order);
2525
}
2626

2727
static inline void set_page_owner(struct page *page,
28-
unsigned int order, gfp_t gfp_mask)
28+
unsigned short order, gfp_t gfp_mask)
2929
{
3030
if (static_branch_unlikely(&page_owner_inited))
3131
__set_page_owner(page, order, gfp_mask);
@@ -52,15 +52,15 @@ static inline void dump_page_owner(const struct page *page)
5252
__dump_page_owner(page);
5353
}
5454
#else
55-
static inline void reset_page_owner(struct page *page, unsigned int order)
55+
static inline void reset_page_owner(struct page *page, unsigned short order)
5656
{
5757
}
5858
static inline void set_page_owner(struct page *page,
5959
unsigned int order, gfp_t gfp_mask)
6060
{
6161
}
6262
static inline void split_page_owner(struct page *page,
63-
unsigned int order)
63+
unsigned short order)
6464
{
6565
}
6666
static inline void folio_copy_owner(struct folio *newfolio, struct folio *folio)

mm/page_owner.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ static noinline depot_stack_handle_t save_stack(gfp_t flags)
125125
return handle;
126126
}
127127

128-
void __reset_page_owner(struct page *page, unsigned int order)
128+
void __reset_page_owner(struct page *page, unsigned short order)
129129
{
130130
int i;
131131
struct page_ext *page_ext;
@@ -149,7 +149,7 @@ void __reset_page_owner(struct page *page, unsigned int order)
149149

150150
static inline void __set_page_owner_handle(struct page_ext *page_ext,
151151
depot_stack_handle_t handle,
152-
unsigned int order, gfp_t gfp_mask)
152+
unsigned short order, gfp_t gfp_mask)
153153
{
154154
struct page_owner *page_owner;
155155
int i;
@@ -169,7 +169,7 @@ static inline void __set_page_owner_handle(struct page_ext *page_ext,
169169
}
170170
}
171171

172-
noinline void __set_page_owner(struct page *page, unsigned int order,
172+
noinline void __set_page_owner(struct page *page, unsigned short order,
173173
gfp_t gfp_mask)
174174
{
175175
struct page_ext *page_ext = lookup_page_ext(page);

0 commit comments

Comments
 (0)