From 2a2bbe57d0b364076b78cac69a82b907a115fbd5 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Fri, 5 Jan 2007 16:37:02 -0800
Subject: [PATCH] --- yaml --- r: 45298 b: refs/heads/master c:
 f2e12bb272f2544d1504f982270e90ae3dcc4ff2 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1a541877d502..d57490aaf84e 100644
--- 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
index 4a9a83fc1b39..a49f96b7ea43 100644
--- 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;