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

Commit bdaa652d authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm: Remove __init annotations from free_bootmem_late" into msm-4.8

parents 219ecde8 7d071756

mm/bootmem.c

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ unsigned long __init init_bootmem(unsigned long start, unsigned long pages) 
 * 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 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
@@ -77,7 +77,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
@@ -1234,7 +1234,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;
@@ -1306,7 +1306,7 @@ static inline bool __meminit 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))