X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=mm%2Fpage_alloc.c;h=8a52ba9fe693bcf749486c3ec5ae6f1e26849700;hb=f3ef9ead31ae995251b420ac98398bd7545bf4e1;hp=3b5358a0561fa99366fbb9c7d2f858c40208b0fb;hpb=24fd425edd53ea580cad917e825c1f6715e9b939;p=linux-2.6-omap-h63xx.git

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 3b5358a0561..8a52ba9fe69 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1845,8 +1845,10 @@ static inline void free_zone_pagesets(int cpu)
 	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);
 	}
 }