evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "mm/migration: make isolate_movable_page() return int type"

Browse source
This commit is contained in:
Linux Build Service Account 2018-03-09 02:47:53 -08:00 • committed by Gerrit - the friendly Code Review server
commit bc60923a9f
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/linux/migrate.h
View file

@ -37,7 +37,7 @@ extern int migrate_page(struct address_space *,
struct page *, struct page *, enum migrate_mode); struct page *, struct page *, enum migrate_mode);
extern int migrate_pages(struct list_head *l, new_page_t new, free_page_t free, extern int migrate_pages(struct list_head *l, new_page_t new, free_page_t free,
unsigned long private, enum migrate_mode mode, int reason); unsigned long private, enum migrate_mode mode, int reason);
extern bool isolate_movable_page(struct page *page, isolate_mode_t mode); extern int isolate_movable_page(struct page *page, isolate_mode_t mode);
extern void putback_movable_page(struct page *page); extern void putback_movable_page(struct page *page);
extern int migrate_prep(void); extern int migrate_prep(void);

2
mm/compaction.c
View file

@ -853,7 +853,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
locked = false; locked = false;
} }
if (isolate_movable_page(page, isolate_mode)) if (!isolate_movable_page(page, isolate_mode))
goto isolate_success; goto isolate_success;
} }

6
mm/migrate.c
View file

@ -75,7 +75,7 @@ int migrate_prep_local(void)
return 0; return 0;
} }
bool isolate_movable_page(struct page *page, isolate_mode_t mode) int isolate_movable_page(struct page *page, isolate_mode_t mode)
{ {
struct address_space *mapping; struct address_space *mapping;
@ -126,14 +126,14 @@ bool isolate_movable_page(struct page *page, isolate_mode_t mode)
__SetPageIsolated(page); __SetPageIsolated(page);
unlock_page(page); unlock_page(page);
return true; return 0;
out_no_isolated: out_no_isolated:
unlock_page(page); unlock_page(page);
out_putpage: out_putpage:
put_page(page); put_page(page);
out: out:
return false; return -EBUSY;
} }
/* It should be called on page which is PG_movable */ /* It should be called on page which is PG_movable */