From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753176AbcELLPH (ORCPT ); Thu, 12 May 2016 07:15:07 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:33489 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752177AbcELLOo (ORCPT ); Thu, 12 May 2016 07:14:44 -0400 From: Michal Hocko To: Andrew Morton Cc: Linus Torvalds , Johannes Weiner , Mel Gorman , David Rientjes , Tetsuo Handa , Joonsoo Kim , Hillf Danton , Vlastimil Babka , , LKML , Michal Hocko Subject: [PATCH 1/2] mmotm: mm-oom-rework-oom-detection-fix Date: Thu, 12 May 2016 13:14:36 +0200 Message-Id: <1463051677-29418-2-git-send-email-mhocko@kernel.org> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1463051677-29418-1-git-send-email-mhocko@kernel.org> References: <1463051677-29418-1-git-send-email-mhocko@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Michal Hocko watermark check should use classzone_idx rather than high_zoneidx to check reserves against the correct (preferred) zone. Signed-off-by: Michal Hocko --- mm/page_alloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 0d9008042efa..620ec002aea2 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3496,7 +3496,7 @@ should_reclaim_retry(gfp_t gfp_mask, unsigned order, * available? */ if (__zone_watermark_ok(zone, order, min_wmark_pages(zone), - ac->high_zoneidx, alloc_flags, available)) { + ac_classzone_idx(ac), alloc_flags, available)) { /* * If we didn't make any progress and have a lot of * dirty + writeback pages then we should wait for -- 2.8.1