---

yaml --- r: 232410 b: refs/heads/master c: 2ff754f h: refs/heads/master v: v3
git-mirror · Jan 26, 2011 · 88b9598 · 88b9598
1 parent 8974c42
commit 88b9598
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f33261d75b88f55a08e6a9648cef73509979bfba
+refs/heads/master: 2ff754fa8f416e82327f2d8f1354a033b66286df
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -1088,8 +1088,10 @@ static void drain_pages(unsigned int cpu)
 		pset = per_cpu_ptr(zone->pageset, cpu);
 
 		pcp = &pset->pcp;
-		free_pcppages_bulk(zone, pcp->count, pcp);
-		pcp->count = 0;
+		if (pcp->count) {
+			free_pcppages_bulk(zone, pcp->count, pcp);
+			pcp->count = 0;
+		}
 		local_irq_restore(flags);
 	}
 }