|
@@ -2471,12 +2471,14 @@ __alloc_pages_high_priority(gfp_t gfp_mask, unsigned int order,
|
|
|
static void wake_all_kswapds(unsigned int order,
|
|
|
struct zonelist *zonelist,
|
|
|
enum zone_type high_zoneidx,
|
|
|
- struct zone *preferred_zone)
|
|
|
+ struct zone *preferred_zone,
|
|
|
+ nodemask_t *nodemask)
|
|
|
{
|
|
|
struct zoneref *z;
|
|
|
struct zone *zone;
|
|
|
|
|
|
- for_each_zone_zonelist(zone, z, zonelist, high_zoneidx)
|
|
|
+ for_each_zone_zonelist_nodemask(zone, z, zonelist,
|
|
|
+ high_zoneidx, nodemask)
|
|
|
wakeup_kswapd(zone, order, zone_idx(preferred_zone));
|
|
|
}
|
|
|
|
|
@@ -2574,7 +2576,8 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
|
|
|
|
|
|
restart:
|
|
|
if (!(gfp_mask & __GFP_NO_KSWAPD))
|
|
|
- wake_all_kswapds(order, zonelist, high_zoneidx, preferred_zone);
|
|
|
+ wake_all_kswapds(order, zonelist, high_zoneidx,
|
|
|
+ preferred_zone, nodemask);
|
|
|
|
|
|
/*
|
|
|
* OK, we're below the kswapd watermark and have kicked background
|