diff --git a/[refs] b/[refs] index 7642409b0bef..6deacb5f2f02 100644 --- 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 index c7be01906998..6b5fb762e2ca 100644 --- 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);