From 060f163786a186d5e7e2f9c9fcae4bb174e5ee5b Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Aug 2012 10:37:03 -0700
Subject: [PATCH] --- yaml --- r: 321194 b: refs/heads/master c:
 8783b6e2b2cb726f2734cf208d101f73ac1ba616 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b0d8cc97aff3..44fab5b90fa1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a9b4993b70fb1884716902774dc9025b457760d
+refs/heads/master: 8783b6e2b2cb726f2734cf208d101f73ac1ba616
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 889532b8e6c1..009ac285fea7 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -4511,7 +4511,7 @@ void __paginginit free_area_init_node(int nid, unsigned long *zones_size,
 	pg_data_t *pgdat = NODE_DATA(nid);
 
 	/* pg_data_t should be reset to zero when it's allocated */
-	WARN_ON(pgdat->nr_zones || pgdat->node_start_pfn || pgdat->classzone_idx);
+	WARN_ON(pgdat->nr_zones || pgdat->classzone_idx);
 
 	pgdat->node_id = nid;
 	pgdat->node_start_pfn = node_start_pfn;