From 46690aafb8bfbbe1dabbad74ded5cbdd7dc7a049 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 30 Aug 2007 23:56:17 -0700
Subject: [PATCH] --- yaml --- r: 64617 b: refs/heads/master c:
 641916881322a2dee5b120d509a3bdd05a502510 h: refs/heads/master i:   64615:
 c18ad4baa7e9da79b23d3f3e30abcac9c02c70d6 v: v3

---
 [refs]                | 2 +-
 trunk/mm/page_alloc.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fba5fce60e03..ea32b251a7f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 060d11b0b35d13eb2251fd08403d900b71df5791
+refs/heads/master: 641916881322a2dee5b120d509a3bdd05a502510
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 6427653023aa..1a8c59571cb7 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -2345,6 +2345,8 @@ static int __cpuinit process_zones(int cpu)
 	return 0;
 bad:
 	for_each_zone(dzone) {
+		if (!populated_zone(dzone))
+			continue;
 		if (dzone == zone)
 			break;
 		kfree(zone_pcp(dzone, cpu));