Commit 8aa043d7 authored by Jan Beulich's avatar Jan Beulich Committed by Linus Torvalds
Browse files

mm/bootmem.c: properly __init-annotate helper functions 



Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9ae49fab

mm/bootmem.c

+4 −4
Original line number Diff line number Diff line
@@ -432,8 +432,8 @@ int __init reserve_bootmem(unsigned long addr, unsigned long size, 
	return mark_bootmem(start, end, 1, flags);

}



static unsigned long align_idx(struct bootmem_data *bdata, unsigned long idx,

			unsigned long step)

static unsigned long __init align_idx(struct bootmem_data *bdata,

				      unsigned long idx, unsigned long step)

{

	unsigned long base = bdata->node_min_pfn;
@@ -445,8 +445,8 @@ static unsigned long align_idx(struct bootmem_data *bdata, unsigned long idx, 
	return ALIGN(base + idx, step) - base;

}



static unsigned long align_off(struct bootmem_data *bdata, unsigned long off,

			unsigned long align)

static unsigned long __init align_off(struct bootmem_data *bdata,

				      unsigned long off, unsigned long align)

{

	unsigned long base = PFN_PHYS(bdata->node_min_pfn);