aboutsummaryrefslogtreecommitdiffstats
path: root/mm/page_alloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r--mm/page_alloc.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 3c9f7f881125..1d6ba6a4b594 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -897,12 +897,6 @@ rebalance:
897 cond_resched(); 897 cond_resched();
898 898
899 if (likely(did_some_progress)) { 899 if (likely(did_some_progress)) {
900 /*
901 * Go through the zonelist yet one more time, keep
902 * very high watermark here, this is only to catch
903 * a parallel oom killing, we must fail if we're still
904 * under heavy pressure.
905 */
906 for (i = 0; (z = zones[i]) != NULL; i++) { 900 for (i = 0; (z = zones[i]) != NULL; i++) {
907 if (!zone_watermark_ok(z, order, z->pages_min, 901 if (!zone_watermark_ok(z, order, z->pages_min,
908 classzone_idx, can_try_harder, 902 classzone_idx, can_try_harder,
@@ -936,7 +930,7 @@ rebalance:
936 goto got_pg; 930 goto got_pg;
937 } 931 }
938 932
939 out_of_memory(gfp_mask); 933 out_of_memory(gfp_mask, order);
940 goto restart; 934 goto restart;
941 } 935 }
942 936