From 878a7bcca776d5dab9477d71c146012bc7fb6f6b Mon Sep 17 00:00:00 2001
From: Minchan Kim <minchan@kernel.org>
Date: Tue, 31 Jul 2012 16:46:14 -0700
Subject: [PATCH] --- yaml --- r: 320865 b: refs/heads/master c:
 88fdf75d1bb51d85ba00c466391770056d44bc03 h: refs/heads/master i:   320863:
 359590956a9d8ae29ba95c39ef49a499c8b7e34c v: v3

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

diff --git a/[refs] b/[refs]
index b437bd787801..025ed348be15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93180cec0064d072a984f91c429c5e6bcc816976
+refs/heads/master: 88fdf75d1bb51d85ba00c466391770056d44bc03
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 48aee0f5902f..a6f7576aecae 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -4515,6 +4515,9 @@ 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);
+
 	pgdat->node_id = nid;
 	pgdat->node_start_pfn = node_start_pfn;
 	calculate_node_totalpages(pgdat, zones_size, zholes_size);