hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mm/madvise.c: replace with page_size() in madvise_inject_error() 

page_size() is supported after the commit a50b854e07 ("mm: introduce
page_size()").

Use page_size() in madvise_inject_error() for readability.

[akpm@linux-foundation.org: use ulong for `size', per David]
Link: http://lkml.kernel.org/r/29dce60c-38d6-0220-f292-e298f0c78c4d@huawei.com
Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: David Rientjes <rientjes@google.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Jan Kara <jack@suse.cz>
Cc: Mike Rapoport <rppt@linux.ibm.com>
Cc: Hu Shiyuan <hushiyuan@huawei.com>
Cc: Feilong Lin <linfeilong@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Yunfeng Ye 2019-11-30 17:57:42 -08:00 committed by Linus Torvalds
parent 5d42ab293f
commit d3cd257ce1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mm/madvise.c
View File

@ -864,13 +864,13 @@ static int madvise_inject_error(int behavior,
{ {
struct page *page; struct page *page;
struct zone *zone; struct zone *zone;
unsigned int order; unsigned long size;
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
return -EPERM; return -EPERM;
for (; start < end; start += PAGE_SIZE << order) { for (; start < end; start += size) {
unsigned long pfn; unsigned long pfn;
int ret; int ret;
@ -882,9 +882,9 @@ static int madvise_inject_error(int behavior,
/* /*
* When soft offlining hugepages, after migrating the page * When soft offlining hugepages, after migrating the page
* we dissolve it, therefore in the second loop "page" will * we dissolve it, therefore in the second loop "page" will
* no longer be a compound page, and order will be 0. * no longer be a compound page.
*/ */
order = compound_order(compound_head(page)); size = page_size(compound_head(page));
if (PageHWPoison(page)) { if (PageHWPoison(page)) {
put_page(page); put_page(page);