From efc7fc6510e97393e03eb2dc866d4ce3efb4a271 Mon Sep 17 00:00:00 2001 From: Andrea Arcangeli Date: Tue, 24 May 2011 17:11:38 -0700 Subject: [PATCH] --- yaml --- r: 250876 b: refs/heads/master c: c6a140bf164829769499b5e50d380893da39b29e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/page_alloc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fb8e34c61320..c82af492d62e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a6cccdc36c966e51fd969560d870cfd37afbfa9c +refs/heads/master: c6a140bf164829769499b5e50d380893da39b29e diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index 77773329aa72..83eaa2eb72f8 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -2107,7 +2107,7 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, 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,