From akpm@osdl.org Fri Jun  9 04:12:07 2006
Date: Fri, 09 Jun 2006 04:11:54 -0700
From: akpm@osdl.org
To: mm-commits@vger.kernel.org
Cc: akpm@osdl.org, clameter@sgi.com
Subject: + zoned-vm-counters-conversion-of-nr_pagecache-to-per-zone-counter-fix.patch added to -mm tree


The patch titled

     zoned-vm-counters-conversion-of-nr_pagecache-to-per-zone-counter-fix

has been added to the -mm tree.  Its filename is

     zoned-vm-counters-conversion-of-nr_pagecache-to-per-zone-counter-fix.patch

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

------------------------------------------------------
Subject: zoned-vm-counters-conversion-of-nr_pagecache-to-per-zone-counter-fix
From: Andrew Morton <akpm@osdl.org>


Cc: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Index: linux-2.6.17-rc6-mm1/mm/page_alloc.c
===================================================================
--- linux-2.6.17-rc6-mm1.orig/mm/page_alloc.c	2006-06-09 12:00:00.272620254 -0700
+++ linux-2.6.17-rc6-mm1/mm/page_alloc.c	2006-06-09 15:10:25.833216303 -0700
@@ -2900,16 +2900,11 @@ static int page_alloc_cpu_notify(struct 
 				 unsigned long action, void *hcpu)
 {
 	int cpu = (unsigned long)hcpu;
-	long *count;
 	unsigned long *src, *dest;
 
 	if (action == CPU_DEAD) {
 		int i;
 
-		/* Drain local pagecache count. */
-		count = &per_cpu(nr_pagecache_local, cpu);
-		atomic_add(*count, &nr_pagecache);
-		*count = 0;
 		local_irq_disable();
 		__drain_pages(cpu);