1 files changed, 3 insertions, 4 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index c13ea7538891..5e92698e5395 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2362,9 +2362,8 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
                 goto nopage;
 
 restart:
-        if (!(gfp_mask & __GFP_NO_KSWAPD))
-                wake_all_kswapd(order, zonelist, high_zoneidx,
-                                                zone_idx(preferred_zone));
+        wake_all_kswapd(order, zonelist, high_zoneidx,
+                                        zone_idx(preferred_zone));
 
         /*
          * OK, we're below the kswapd watermark and have kicked background
@@ -2441,7 +2440,7 @@ rebalance:
          * system then fail the allocation instead of entering direct reclaim.
          */
         if ((deferred_compaction || contended_compaction) &&
-                                                (gfp_mask & __GFP_NO_KSWAPD))
+            (gfp_mask & (__GFP_MOVABLE|__GFP_REPEAT)) == __GFP_MOVABLE)
                 goto nopage;
 
         /* Try direct reclaim and then allocating */