summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorAndrea Arcangeli <aarcange@redhat.com>2011-05-24 17:11:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-25 08:39:10 -0700
commitc6a140bf164829769499b5e50d380893da39b29e (patch)
tree0cfcbd5356cd3cebabba2334dcfdaec6ea47d816 /mm
parenta6cccdc36c966e51fd969560d870cfd37afbfa9c (diff)
downloadlinux-3.10-c6a140bf164829769499b5e50d380893da39b29e.tar.gz
linux-3.10-c6a140bf164829769499b5e50d380893da39b29e.tar.bz2
linux-3.10-c6a140bf164829769499b5e50d380893da39b29e.zip
mm/compaction: reverse the change that forbade sync migraton with __GFP_NO_KSWAPD
It's uncertain this has been beneficial, so it's safer to undo it. All other compaction users would still go in synchronous mode if a first attempt at async compaction failed. Hopefully we don't need to force special behavior for THP (which is the only __GFP_NO_KSWAPD user so far and it's the easier to exercise and to be noticeable). This also make __GFP_NO_KSWAPD return to its original strict semantics specific to bypass kswapd, as THP allocations have khugepaged for the async THP allocations/compactions. Signed-off-by: Andrea Arcangeli <aarcange@redhat.com> Cc: Alex Villacis Lasso <avillaci@fiec.espol.edu.ec> Cc: Mel Gorman <mel@csn.ul.ie> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/page_alloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 77773329aa7..83eaa2eb72f 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2107,7 +2107,7 @@ rebalance:
sync_migration);
if (page)
goto got_pg;
- sync_migration = !(gfp_mask & __GFP_NO_KSWAPD);
+ sync_migration = true;
/* Try direct reclaim and then allocating */
page = __alloc_pages_direct_reclaim(gfp_mask, order,