---

yaml --- r: 320860 b: refs/heads/master c: 5b760e6 h: refs/heads/master v: v3
git-mirror · Aug 1, 2012 · b683230 · b683230
1 parent df02c3c
commit b683230
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b214514592d2dcb0b9d14ee8dd14f3699e3b0a84
+refs/heads/master: 5b760e64a64c8940cdccd0ba6fce19a9bd010d20
diff --git a/trunk/mm/sparse.c b/trunk/mm/sparse.c
@@ -65,14 +65,12 @@ static struct mem_section noinline __init_refok *sparse_index_alloc(int nid)
 
 	if (slab_is_available()) {
 		if (node_state(nid, N_HIGH_MEMORY))
-			section = kmalloc_node(array_size, GFP_KERNEL, nid);
+			section = kzalloc_node(array_size, GFP_KERNEL, nid);
 		else
-			section = kmalloc(array_size, GFP_KERNEL);
-	} else
+			section = kzalloc(array_size, GFP_KERNEL);
+	} else {
 		section = alloc_bootmem_node(NODE_DATA(nid), array_size);
-
-	if (section)
-		memset(section, 0, array_size);
+	}
 
 	return section;
 }