From bd25bb0055ae5ea7696f0a823bb8cfc766c102ab Mon Sep 17 00:00:00 2001
From: Nick Piggin <nickpiggin@yahoo.com.au>
Date: Fri, 6 Jan 2006 00:10:59 -0800
Subject: [PATCH] --- yaml --- r: 16319 b: refs/heads/master c:
 2d92c5c9150a2a9ca3dc25da58d5042e17a96b6a h: refs/heads/master i:   16317:
 3e2e2d627b057ff645557ffd633794ef538cbac7   16315:
 9c4abde12a7669477a446c8525a12631b608ed20   16311:
 2ae512c27cb9ed5e1e3ebc02ea160c0bea5b60b9   16303:
 0d51423d06c59bc33d7613939cd6d975c6e3b831   16287:
 97a6b7ed60624cb864daa4155b15147e167b629d   16255:
 b69fd24aa9cbdb9b4815ace69380b43f323a2f12 v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/mmzone.h | 1 -
 trunk/mm/page_alloc.c        | 9 ++-------
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index ed1ac6c53cd2..b4dbc62384b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13e7444b0ec59f96d81a4e8c379d5f38fc5f2cc1
+refs/heads/master: 2d92c5c9150a2a9ca3dc25da58d5042e17a96b6a
diff --git a/trunk/include/linux/mmzone.h b/trunk/include/linux/mmzone.h
index 8cba76c6a28c..0d1a5981bb94 100644
--- a/trunk/include/linux/mmzone.h
+++ b/trunk/include/linux/mmzone.h
@@ -46,7 +46,6 @@ struct zone_padding {
 
 struct per_cpu_pages {
 	int count;		/* number of pages in the list */
-	int low;		/* low watermark, refill needed */
 	int high;		/* high watermark, emptying needed */
 	int batch;		/* chunk size for buddy add/remove */
 	struct list_head list;	/* the list of pages */
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 088712f2ac02..7cff958e7813 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -740,7 +740,7 @@ buffered_rmqueue(struct zone *zone, int order, gfp_t gfp_flags)
 		page = NULL;
 		pcp = &zone_pcp(zone, get_cpu())->pcp[cold];
 		local_irq_save(flags);
-		if (pcp->count <= pcp->low)
+		if (!pcp->count)
 			pcp->count += rmqueue_bulk(zone, 0,
 						pcp->batch, &pcp->list);
 		if (likely(pcp->count)) {
@@ -1345,10 +1345,9 @@ void show_free_areas(void)
 			pageset = zone_pcp(zone, cpu);
 
 			for (temperature = 0; temperature < 2; temperature++)
-				printk("cpu %d %s: low %d, high %d, batch %d used:%d\n",
+				printk("cpu %d %s: high %d, batch %d used:%d\n",
 					cpu,
 					temperature ? "cold" : "hot",
-					pageset->pcp[temperature].low,
 					pageset->pcp[temperature].high,
 					pageset->pcp[temperature].batch,
 					pageset->pcp[temperature].count);
@@ -1790,14 +1789,12 @@ inline void setup_pageset(struct per_cpu_pageset *p, unsigned long batch)
 
 	pcp = &p->pcp[0];		/* hot */
 	pcp->count = 0;
-	pcp->low = 0;
 	pcp->high = 6 * batch;
 	pcp->batch = max(1UL, 1 * batch);
 	INIT_LIST_HEAD(&pcp->list);
 
 	pcp = &p->pcp[1];		/* cold*/
 	pcp->count = 0;
-	pcp->low = 0;
 	pcp->high = 2 * batch;
 	pcp->batch = max(1UL, batch/2);
 	INIT_LIST_HEAD(&pcp->list);
@@ -2193,12 +2190,10 @@ static int zoneinfo_show(struct seq_file *m, void *arg)
 				seq_printf(m,
 					   "\n    cpu: %i pcp: %i"
 					   "\n              count: %i"
-					   "\n              low:   %i"
 					   "\n              high:  %i"
 					   "\n              batch: %i",
 					   i, j,
 					   pageset->pcp[j].count,
-					   pageset->pcp[j].low,
 					   pageset->pcp[j].high,
 					   pageset->pcp[j].batch);
 			}