diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-02-03 17:57:16 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-02-03 17:57:16 +0100 |
| commit | 3fe9cf390f6dc84f76b112b0a660967a84f9a81b (patch) | |
| tree | 18b8573687ae8131db155aa791f4d2357d91e6c5 /mm/vmscan.c | |
| parent | 6ccd93bdb989507717edb375d40534f1177822c5 (diff) | |
| parent | 830953c0724b42be30a74febcde6c89c706ed286 (diff) | |
| download | lwn-3fe9cf390f6dc84f76b112b0a660967a84f9a81b.tar.gz lwn-3fe9cf390f6dc84f76b112b0a660967a84f9a81b.zip | |
Merge branch 'topic/snd-device' into for-next
Diffstat (limited to 'mm/vmscan.c')
| -rw-r--r-- | mm/vmscan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index ab2505c3ef54..dcd90c891d8e 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2656,7 +2656,7 @@ static bool throttle_direct_reclaim(gfp_t gfp_mask, struct zonelist *zonelist, * should make reasonable progress. */ for_each_zone_zonelist_nodemask(zone, z, zonelist, - gfp_mask, nodemask) { + gfp_zone(gfp_mask), nodemask) { if (zone_idx(zone) > ZONE_NORMAL) continue; |