Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c42b5c20 authored by Laura Abbott's avatar Laura Abbott Committed by Swathi Sridhar
Browse files

mm: Remove __init annotations from free_bootmem_late 



free_bootmem_late is currently set up to only be used in init
functions. Some clients need to use this function past initcalls.
The functions themselves have no restrictions on being used later
minus the __init annotations so remove the annotation.

Change-Id: I7c7e15cf2780a8843ebb4610da5b633c9abb0b3d
Signed-off-by: default avatarLaura Abbott <lauraa@codeaurora.org>
[abhimany@codeaurora.org: resolve minor conflict
and remove __init from nobootmem.c]
Signed-off-by: default avatarAbhimanyu Kapur <abhimany@codeaurora.org>
Signed-off-by: default avatarPatrick Daly <pdaly@codeaurora.org>
parent 6ecb9977

mm/bootmem.c

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ unsigned long __init init_bootmem(unsigned long start, unsigned long pages) 
	return init_bootmem_core(NODE_DATA(0)->bdata, start, 0, pages);

}



void __init free_bootmem_late(unsigned long physaddr, unsigned long size)

void free_bootmem_late(unsigned long physaddr, unsigned long size)

{

	unsigned long cursor, end;

mm/nobootmem.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static void * __init __alloc_memory_core_early(int nid, u64 size, u64 align, 
 * down, but we are still initializing the system.  Pages are given directly

 * to the page allocator, no bootmem metadata is updated because it is gone.

 */

void __init free_bootmem_late(unsigned long addr, unsigned long size)

void free_bootmem_late(unsigned long addr, unsigned long size)

{

	unsigned long cursor, end;

mm/page_alloc.c

+2 −2
Original line number Diff line number Diff line
@@ -1264,7 +1264,7 @@ static void __free_pages_ok(struct page *page, unsigned int order) 
	local_irq_restore(flags);

}



static void __init __free_pages_boot_core(struct page *page, unsigned int order)

static void __free_pages_boot_core(struct page *page, unsigned int order)

{

	unsigned int nr_pages = 1 << order;

	struct page *p = page;
@@ -1338,7 +1338,7 @@ meminit_pfn_in_nid(unsigned long pfn, int node, 
#endif





void __init __free_pages_bootmem(struct page *page, unsigned long pfn,

void __free_pages_bootmem(struct page *page, unsigned long pfn,

							unsigned int order)

{

	if (early_page_uninitialised(pfn))