From 9b85dd248ba0505d0e6488db62e93f068bc95d52 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <cody@linux.vnet.ibm.com>
Date: Fri, 22 Feb 2013 16:35:25 -0800
Subject: [PATCH] --- yaml --- r: 356599 b: refs/heads/master c:
 d29bb9782d22063892e28716cdb76a87d2876ddb h: refs/heads/master i:   356597:
 1242954db5bd84d6a24ed514408fb6dab7dd8fef   356595:
 95a5b71d27488ff1d35de1b235bad6e2ca1cb0e1   356591:
 680883577ddb80eb7e5a9de7cb953aa561f0b5c9 v: v3

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

diff --git a/[refs] b/[refs]
index 8c3ec6a5ddeb..ed7c0984cf70 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a6e3ebee2edcade56f836390a5f0c7b76ff5f9e
+refs/heads/master: d29bb9782d22063892e28716cdb76a87d2876ddb
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index a3687afc5917..9614aabee8c5 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -538,6 +538,8 @@ static inline void __free_one_page(struct page *page,
 	unsigned long uninitialized_var(buddy_idx);
 	struct page *buddy;
 
+	VM_BUG_ON(!zone_is_initialized(zone));
+
 	if (unlikely(PageCompound(page)))
 		if (unlikely(destroy_compound_page(page, order)))
 			return;