---

yaml --- r: 320865 b: refs/heads/master c: 88fdf75 h: refs/heads/master i: 320863: 3595909 v: v3
git-mirror · Aug 1, 2012 · 878a7bc · 878a7bc
1 parent 2526fb3
commit 878a7bc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);