diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-26 16:25:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-26 16:25:42 -0800 |
| commit | 4adca1cbc4cedb31aba03497b3de238ea13b566a (patch) | |
| tree | 7f5e26da972eb9a5653f9c87cb9db471200702bf /mm/vmscan.c | |
| parent | c976a67b02821d324f5e9fffe87e807364fe1a0e (diff) | |
| parent | 45cd15e600ec8006305ce83f62c7208c2cb7a052 (diff) | |
| download | lwn-4adca1cbc4cedb31aba03497b3de238ea13b566a.tar.gz lwn-4adca1cbc4cedb31aba03497b3de238ea13b566a.zip | |
Merge branch 'akpm' (patches from Andrew Morton)
Merge misc fixes from Andrew Morton:
"Six fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
drivers/rtc/rtc-s5m.c: terminate s5m_rtc_id array with empty element
printk: add dummy routine for when CONFIG_PRINTK=n
mm/vmscan: fix highidx argument type
memcg: remove extra newlines from memcg oom kill log
x86, build: replace Perl script with Shell script
mm: page_alloc: embed OOM killing naturally into allocation slowpath
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; |