From: Nick Piggin struct per_cpu_pages.low is useless. Remove it. Signed-off-by: Nick Piggin Cc: Hugh Dickins Signed-off-by: Andrew Morton --- include/linux/mmzone.h | 1 - mm/page_alloc.c | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) diff -puN include/linux/mmzone.h~mm-remove-pcp-low include/linux/mmzone.h --- devel/include/linux/mmzone.h~mm-remove-pcp-low 2005-12-10 21:49:58.000000000 -0800 +++ devel-akpm/include/linux/mmzone.h 2005-12-10 21:49:58.000000000 -0800 @@ -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 -puN mm/page_alloc.c~mm-remove-pcp-low mm/page_alloc.c --- devel/mm/page_alloc.c~mm-remove-pcp-low 2005-12-10 21:49:58.000000000 -0800 +++ devel-akpm/mm/page_alloc.c 2005-12-10 21:49:58.000000000 -0800 @@ -740,7 +740,7 @@ again: 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)) { @@ -1346,10 +1346,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); @@ -1791,14 +1790,12 @@ inline void setup_pageset(struct per_cpu 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); @@ -2194,12 +2191,10 @@ static int zoneinfo_show(struct seq_file 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); } _