diff --git a/[refs] b/[refs] index d2caf2553372..1c9acd97090b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ed361dec36945f3116ee1338638ada9a8920905 +refs/heads/master: a322f8ab66f50b6c0dcdb59abae84fede7a5fded diff --git a/trunk/mm/sparse.c b/trunk/mm/sparse.c index 7859c8083334..f6a43c09c322 100644 --- a/trunk/mm/sparse.c +++ b/trunk/mm/sparse.c @@ -237,7 +237,7 @@ static unsigned long *__kmalloc_section_usemap(void) } #endif /* CONFIG_MEMORY_HOTPLUG */ -static unsigned long *sparse_early_usemap_alloc(unsigned long pnum) +static unsigned long *__init sparse_early_usemap_alloc(unsigned long pnum) { unsigned long *usemap; struct mem_section *ms = __nr_to_section(pnum);