From c8779b7ba4218e2cd549b2a2e3cb58ccbf5c149d Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@shadowen.org>
Date: Fri, 23 May 2008 13:04:50 -0700
Subject: [PATCH] --- yaml --- r: 97266 b: refs/heads/master c:
 7eb54824b76793dd86afb54f182ef9aa64b3a45a 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 9b22e53e6b33..ffd393ac2e87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03a74dcc7eebe6edd778317e82fafdf71e68488c
+refs/heads/master: 7eb54824b76793dd86afb54f182ef9aa64b3a45a
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 035300299f94..7f4c66ff65b7 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -1396,6 +1396,9 @@ get_page_from_freelist(gfp_t gfp_mask, nodemask_t *nodemask, unsigned int order,
 
 	(void)first_zones_zonelist(zonelist, high_zoneidx, nodemask,
 							&preferred_zone);
+	if (!preferred_zone)
+		return NULL;
+
 	classzone_idx = zone_idx(preferred_zone);
 
 zonelist_scan: