Skip to content

Commit

Permalink
mm/bootmem.c: properly __init-annotate helper functions
Browse files Browse the repository at this point in the history
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jan Beulich authored and Linus Torvalds committed Dec 15, 2009
1 parent 9ae49fa commit 8aa043d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions mm/bootmem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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);

Expand Down

0 comments on commit 8aa043d

Please sign in to comment.