projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-4.4/io-poll' of git://git.kernel.dk/linux-block
[cascardo/linux.git]
/
mm
/
migrate.c
diff --git
a/mm/migrate.c
b/mm/migrate.c
index
2834fab
..
7890d0b
100644
(file)
--- a/
mm/migrate.c
+++ b/
mm/migrate.c
@@
-1578,7
+1578,7
@@
static struct page *alloc_misplaced_dst_page(struct page *page,
(GFP_HIGHUSER_MOVABLE |
__GFP_THISNODE | __GFP_NOMEMALLOC |
__GFP_NORETRY | __GFP_NOWARN) &
(GFP_HIGHUSER_MOVABLE |
__GFP_THISNODE | __GFP_NOMEMALLOC |
__GFP_NORETRY | __GFP_NOWARN) &
- ~
GFP_IOFS
, 0);
+ ~
(__GFP_IO | __GFP_FS)
, 0);
return newpage;
}
return newpage;
}
@@
-1752,7
+1752,7
@@
int migrate_misplaced_transhuge_page(struct mm_struct *mm,
goto out_dropref;
new_page = alloc_pages_node(node,
goto out_dropref;
new_page = alloc_pages_node(node,
- (GFP_TRANSHUGE | __GFP_THISNODE) & ~__GFP_
WAIT
,
+ (GFP_TRANSHUGE | __GFP_THISNODE) & ~__GFP_
RECLAIM
,
HPAGE_PMD_ORDER);
if (!new_page)
goto out_fail;
HPAGE_PMD_ORDER);
if (!new_page)
goto out_fail;