diff --git a/[refs] b/[refs] index 226880b8f0af..ec73be45dfb5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d1a07d487d8b36658404839cdf03a974968cefd +refs/heads/master: 69d49e681d7c7ed864a1ba45efc1e78433df8b9a diff --git a/trunk/mm/bootmem.c b/trunk/mm/bootmem.c index 50353e0dac12..70f1528a3c8a 100644 --- a/trunk/mm/bootmem.c +++ b/trunk/mm/bootmem.c @@ -54,7 +54,7 @@ unsigned long __init bootmem_bootmap_pages (unsigned long pages) /* * link bdata in order */ -static void link_bootmem(bootmem_data_t *bdata) +static void __init link_bootmem(bootmem_data_t *bdata) { bootmem_data_t *ent; if (list_empty(&bdata_list)) {