diff mbox

Revert "UBUNTU: SAUCE: (no-up) If zone is so small that watermarks are the same, stop zone balance."

Message ID 1476318429-50046-1-git-send-email-seth.forshee@canonical.com
State New
Headers show

Commit Message

Seth Forshee Oct. 13, 2016, 12:27 a.m. UTC
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 <seth.forshee@canonical.com>
---
 mm/vmscan.c | 7 -------
 1 file changed, 7 deletions(-)

Comments

Jay Vosburgh Oct. 13, 2016, 12:29 a.m. UTC | #1
Seth Forshee <seth.forshee@canonical.com> wrote:

>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 <seth.forshee@canonical.com>

Acked-by: Jay Vosburgh <jay.vosburgh@canonical.com>


>---
> 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;
> 
>-- 
>2.7.4
>
>
>-- 
>kernel-team mailing list
>kernel-team@lists.ubuntu.com
>https://lists.ubuntu.com/mailman/listinfo/kernel-team
Brad Figg Oct. 13, 2016, 2:36 a.m. UTC | #2

Seth Forshee Oct. 13, 2016, 2:54 a.m. UTC | #3

diff mbox

Patch

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;