diff --git a/[refs] b/[refs] index 7581f63ee0e4..6f6454531636 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af2422c42c0ff42b8b93dbb3a5fe65250fb65c40 +refs/heads/master: de3fab39348dff18c69a0cd04efee9c276a02f51 diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c index 885207a6b6b7..c26986c85ce0 100644 --- a/trunk/mm/vmscan.c +++ b/trunk/mm/vmscan.c @@ -1922,6 +1922,9 @@ static int sleeping_prematurely(pg_data_t *pgdat, int order, long remaining) if (!populated_zone(zone)) continue; + if (zone_is_all_unreclaimable(zone)) + continue; + if (!zone_watermark_ok(zone, order, high_wmark_pages(zone), 0, 0)) return 1;