---

yaml --- r: 338735 b: refs/heads/master c: 3ac19f8 h: refs/heads/master i: 338733: cf8d342 338731: 705a3ae 338727: 7fae89b 338719: df1b992 v: v3
git-mirror · Dec 12, 2012 · fdc9d72 · fdc9d72
1 parent 1eb143b
commit fdc9d72
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c7b5b4ed948d1ddf9672ee932a16750b280822a
+refs/heads/master: 3ac19f8efe26451cacac31d0be34fa9c51114c2a
diff --git a/trunk/mm/sparse.c b/trunk/mm/sparse.c
@@ -638,7 +638,6 @@ static struct page *__kmalloc_section_memmap(unsigned long nr_pages)
 got_map_page:
 	ret = (struct page *)pfn_to_kaddr(page_to_pfn(page));
 got_map_ptr:
-	memset(ret, 0, memmap_size);
 
 	return ret;
 }
@@ -758,6 +757,8 @@ int __meminit sparse_add_one_section(struct zone *zone, unsigned long start_pfn,
 		goto out;
 	}
 
+	memset(memmap, 0, sizeof(struct page) * nr_pages);
+
 	ms->section_mem_map |= SECTION_MARKED_PRESENT;
 
 	ret = sparse_init_one_section(ms, section_nr, memmap, usemap);