---

yaml --- r: 35528 b: refs/heads/master c: f3ef9ea h: refs/heads/master v: v3
git-mirror · Sep 26, 2006 · e37ce0d · e37ce0d
1 parent 3082519
commit e37ce0d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24fd425edd53ea580cad917e825c1f6715e9b939
+refs/heads/master: f3ef9ead31ae995251b420ac98398bd7545bf4e1
diff --git a/trunk/mm/page_alloc.c b/trunk/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);
 	}
 }