commit f3ef9ead31ae995251b420ac98398bd7545bf4e1
author David Rientjes <rientjes@cs.washington.edu> Mon Sep 25 16:24:57 2006 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Mon Sep 25 17:38:36 2006 -0700
tree aa5addbe49c1f7864bc2e5023b7edb11aaf3706b
parent 24fd425edd53ea580cad917e825c1f6715e9b939

[PATCH] do not free non slab allocated per_cpu_pageset

Stops panic associated with attempting to free a non slab-allocated
per_cpu_pageset.

Signed-off-by: David Rientjes <rientjes@cs.washington.edu>
Acked-by: Christoph Lameter <clameter@sgi.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

mm/page_alloc.c

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 3b5358a..8a52ba9 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1845,8 +1845,10 @@
 	for_each_zone(zone) {
 		struct per_cpu_pageset *pset = zone_pcp(zone, cpu);
 
+		/* Free per_cpu_pageset if it is slab allocated */
+		if (pset != &boot_pageset[cpu])
+			kfree(pset);
 		zone_pcp(zone, cpu) = NULL;
-		kfree(pset);
 	}
 }