diff --git a/[refs] b/[refs] index bc87c2f9ec44..ea0c0e8deca2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79b9ce311e192e9a31fd9f3cf1ee4a4edf9e2650 +refs/heads/master: 37b173a4d03d1681e6c9529bc43d7a3308132db6 diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index 7fbd3ea8765c..1d6ba6a4b594 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -897,12 +897,6 @@ __alloc_pages(unsigned int __nocast gfp_mask, unsigned int order, cond_resched(); if (likely(did_some_progress)) { - /* - * Go through the zonelist yet one more time, keep - * very high watermark here, this is only to catch - * a parallel oom killing, we must fail if we're still - * under heavy pressure. - */ for (i = 0; (z = zones[i]) != NULL; i++) { if (!zone_watermark_ok(z, order, z->pages_min, classzone_idx, can_try_harder,