mm/hugetlb: create hugetlb cgroup file in hugetlb_init

[firefly-linux-kernel-4.4.55.git] / mm / sparse.c

diff --git a/mm/sparse.c b/mm/sparse.c
index c7be019069988e4cb0b11f3c77068212f3478970..6b5fb762e2caf42eaeddeaef0cf8697175786cfd 100644 (file)
--- a/mm/sparse.c
+++ b/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);