From 40b6879fe774044be1c60ab8f91ae65a4c0c5983 Mon Sep 17 00:00:00 2001
From: Zlatko Calusic <zlatko.calusic@iskon.hr>
Date: Fri, 22 Feb 2013 16:34:06 -0800
Subject: [PATCH] --- yaml --- r: 356551 b: refs/heads/master c:
 258401a60c4df39332f30ef57afbc6dbf29a7e84 h: refs/heads/master i:   356549:
 41825ef6b9f28dd683fe600c6c387d2706c8d3b7   356547:
 3031e1adfedcf3988a5794aed28b1ab42921fb62   356543:
 8863ea7e77341637d6998f8b1fd17b73bededb37 v: v3

---
 [refs]                              |  2 +-
 trunk/include/linux/vm_event_item.h |  1 -
 trunk/mm/vmscan.c                   | 29 +----------------------------
 trunk/mm/vmstat.c                   |  1 -
 4 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/[refs] b/[refs]
index 292ad6c6ad30..c1e1e6bb8b9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4db0e950c5b78586bea9e1b027be849631f89a17
+refs/heads/master: 258401a60c4df39332f30ef57afbc6dbf29a7e84
diff --git a/trunk/include/linux/vm_event_item.h b/trunk/include/linux/vm_event_item.h
index fce0a2799d43..bd6cf61142be 100644
--- a/trunk/include/linux/vm_event_item.h
+++ b/trunk/include/linux/vm_event_item.h
@@ -36,7 +36,6 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT,
 #endif
 		PGINODESTEAL, SLABS_SCANNED, KSWAPD_INODESTEAL,
 		KSWAPD_LOW_WMARK_HIT_QUICKLY, KSWAPD_HIGH_WMARK_HIT_QUICKLY,
-		KSWAPD_SKIP_CONGESTION_WAIT,
 		PAGEOUTRUN, ALLOCSTALL, PGROTATED,
 #ifdef CONFIG_NUMA_BALANCING
 		NUMA_PTE_UPDATES,
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
index 8fde2fc223d9..b93968b71dc6 100644
--- a/trunk/mm/vmscan.c
+++ b/trunk/mm/vmscan.c
@@ -2617,7 +2617,6 @@ static unsigned long balance_pgdat(pg_data_t *pgdat, int order,
 							int *classzone_idx)
 {
 	bool pgdat_is_balanced = false;
-	struct zone *unbalanced_zone;
 	int i;
 	int end_zone = 0;	/* Inclusive.  0 = ZONE_DMA */
 	unsigned long total_scanned;
@@ -2648,9 +2647,6 @@ static unsigned long balance_pgdat(pg_data_t *pgdat, int order,
 
 	do {
 		unsigned long lru_pages = 0;
-		int has_under_min_watermark_zone = 0;
-
-		unbalanced_zone = NULL;
 
 		/*
 		 * Scan in the highmem->dma direction for the highest
@@ -2790,17 +2786,7 @@ static unsigned long balance_pgdat(pg_data_t *pgdat, int order,
 				continue;
 			}
 
-			if (!zone_balanced(zone, testorder, 0, end_zone)) {
-				unbalanced_zone = zone;
-				/*
-				 * We are still under min water mark.  This
-				 * means that we have a GFP_ATOMIC allocation
-				 * failure risk. Hurry up!
-				 */
-				if (!zone_watermark_ok_safe(zone, order,
-					    min_wmark_pages(zone), end_zone, 0))
-					has_under_min_watermark_zone = 1;
-			} else {
+			if (zone_balanced(zone, testorder, 0, end_zone))
 				/*
 				 * If a zone reaches its high watermark,
 				 * consider it to be no longer congested. It's
@@ -2809,8 +2795,6 @@ static unsigned long balance_pgdat(pg_data_t *pgdat, int order,
 				 * speculatively avoid congestion waits
 				 */
 				zone_clear_flag(zone, ZONE_CONGESTED);
-			}
-
 		}
 
 		/*
@@ -2827,17 +2811,6 @@ static unsigned long balance_pgdat(pg_data_t *pgdat, int order,
 			break;		/* kswapd: all done */
 		}
 
-		/*
-		 * OK, kswapd is getting into trouble.  Take a nap, then take
-		 * another pass across the zones.
-		 */
-		if (total_scanned && (sc.priority < DEF_PRIORITY - 2)) {
-			if (has_under_min_watermark_zone)
-				count_vm_event(KSWAPD_SKIP_CONGESTION_WAIT);
-			else if (unbalanced_zone)
-				wait_iff_congested(unbalanced_zone, BLK_RW_ASYNC, HZ/10);
-		}
-
 		/*
 		 * We do this so kswapd doesn't build up large priorities for
 		 * example when it is freeing in parallel with allocators. It
diff --git a/trunk/mm/vmstat.c b/trunk/mm/vmstat.c
index c9d1f68120cd..57f02fd1768b 100644
--- a/trunk/mm/vmstat.c
+++ b/trunk/mm/vmstat.c
@@ -770,7 +770,6 @@ const char * const vmstat_text[] = {
 	"kswapd_inodesteal",
 	"kswapd_low_wmark_hit_quickly",
 	"kswapd_high_wmark_hit_quickly",
-	"kswapd_skip_congestion_wait",
 	"pageoutrun",
 	"allocstall",