From patchwork Thu Oct 13 00:27:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 681523 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3svWlJ20BNz9sBR; Thu, 13 Oct 2016 11:27:24 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical-com.20150623.gappssmtp.com header.i=@canonical-com.20150623.gappssmtp.com header.b=HuokEBU0; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1buTrg-0002Ak-KR; Thu, 13 Oct 2016 00:27:16 +0000 Received: from mail-oi0-f45.google.com ([209.85.218.45]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1buTrc-0002Ac-1K for kernel-team@lists.ubuntu.com; Thu, 13 Oct 2016 00:27:12 +0000 Received: by mail-oi0-f45.google.com with SMTP id d132so80211569oib.2 for ; Wed, 12 Oct 2016 17:27:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=h+pw4meeHvrkPBGNJwc1tA9H7u9mis5iVnX5QisqMQw=; b=HuokEBU0Yb+u0PoKbemQG6iop6VXy9VatBW7LpVowm9hKzJXHcZHCX9nno6klNzaoJ IMzA2yUN+ZLR50rvN0zXQ9bUXClf1pBSCHOYueukmKqJoyZfc+yrlMID4YiDQMzRnxuv 7viiOYH5ESSbNb4yPWOHaZzMdxdL2qzatnXH7L176pudqxNWjI4Z0vzoRgPO6I/p7Xud kXM6cUJo003dJed/C+YUn/kVxgVP+zl48822GqoE0796PAGkHWmemddpuXsQ5+Ijo8lr oPCAjMvjH08Jdj3sRTN3Pe75/AW4SeUBu5uXheKWFbwPhreRLkrcEQDkaJLVHCtGroxs Oh2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=h+pw4meeHvrkPBGNJwc1tA9H7u9mis5iVnX5QisqMQw=; b=KZUUb0W0JExmrS54u6tzokQbWow749HcKK568dqEjI46uLMEu1NSQYo7GK5LdUVVzv /hL4cxwtowUFH5v2zXppchAmJlWWCyNH3bBoW5C6rbZHfjdoQ73i0RPMjzq9QuJSCmjg dbPqa3rI/IpJ4Nw0ky64qNhQYvjCr2Ec0h4UncucVTAUWOddy7800DlrVWECrFDczgzb XrXcd5enkmosrtUDcdr3ufxM2wnBu//qaVh1jFnwV6Sga3v3zfo1IbY0+Q1fol5XUFDF tsj7CK1fYg2giBY4j8Z02Qcr3Vjqh5jjdHHcrJ0ahZ5XgrmDtdyo4pKZxfW7esLyay3I ZiLw== X-Gm-Message-State: AA6/9RlxdMg5zMv72xJ+1byqhD0uHmfQVr00eQ5BrhULu211n7N8MG7F3y60/9mM4QPzUYGR X-Received: by 10.157.11.49 with SMTP id a46mr2029274ota.184.1476318430635; Wed, 12 Oct 2016 17:27:10 -0700 (PDT) Received: from localhost ([2605:a601:aa9:6620:e5c7:e3e8:629e:7973]) by smtp.gmail.com with ESMTPSA id n196sm3755741oig.8.2016.10.12.17.27.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Oct 2016 17:27:09 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH] Revert "UBUNTU: SAUCE: (no-up) If zone is so small that watermarks are the same, stop zone balance." Date: Wed, 12 Oct 2016 19:27:09 -0500 Message-Id: <1476318429-50046-1-git-send-email-seth.forshee@canonical.com> X-Mailer: git-send-email 2.7.4 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/1632894 This reverts commit 6d748af3bb9d0b670e7d72da11faaf79a45120f5, which was errantly deemed appropriate to yakkety but is not needed. Signed-off-by: Seth Forshee Acked-by: Jay Vosburgh --- mm/vmscan.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 9e2b3e5821c7..0fe8b7113868 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -3080,13 +3080,6 @@ static bool zone_balanced(struct zone *zone, int order, int classzone_idx) { unsigned long mark = high_wmark_pages(zone); - /* - * if zone is so small that watermarks are the same, don't bother trying - * to balance; kswapd would just spin continuously trying to balance it. - */ - if (low_wmark_pages(zone) == mark) - return true; - if (!zone_watermark_ok_safe(zone, order, mark, classzone_idx)) return false;