---

yaml --- r: 45298 b: refs/heads/master c: f2e12bb h: refs/heads/master v: v3
git-mirror · Jan 6, 2007 · 2a2bbe5 · 2a2bbe5
1 parent 00e6b76
commit 2a2bbe5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6929da4427b4335365dd51ab0b7dd2a0393656f0
+refs/heads/master: f2e12bb272f2544d1504f982270e90ae3dcc4ff2
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -711,6 +711,9 @@ static void __drain_pages(unsigned int cpu)
 	for_each_zone(zone) {
 		struct per_cpu_pageset *pset;
 
+		if (!populated_zone(zone))
+			continue;
+
 		pset = zone_pcp(zone, cpu);
 		for (i = 0; i < ARRAY_SIZE(pset->pcp); i++) {
 			struct per_cpu_pages *pcp;