diff options
author | Jan Beulich <JBeulich@novell.com> | 2009-12-14 20:59:46 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 11:53:20 -0500 |
commit | 8aa043d74559556a661cb2eb6e64497eec86ec77 (patch) | |
tree | 73559e8b70d2f2d139ca3c404687873d34ff7b36 /mm/bootmem.c | |
parent | 9ae49fab239fb49de92a657c7426271e0793c4e1 (diff) |
mm/bootmem.c: properly __init-annotate helper functions
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>
Diffstat (limited to 'mm/bootmem.c')
-rw-r--r-- | mm/bootmem.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/bootmem.c b/mm/bootmem.c index d1dc23cc7f10..7d1486875e1c 100644 --- a/mm/bootmem.c +++ b/mm/bootmem.c | |||
@@ -432,8 +432,8 @@ int __init reserve_bootmem(unsigned long addr, unsigned long size, | |||
432 | return mark_bootmem(start, end, 1, flags); | 432 | return mark_bootmem(start, end, 1, flags); |
433 | } | 433 | } |
434 | 434 | ||
435 | static unsigned long align_idx(struct bootmem_data *bdata, unsigned long idx, | 435 | static unsigned long __init align_idx(struct bootmem_data *bdata, |
436 | unsigned long step) | 436 | unsigned long idx, unsigned long step) |
437 | { | 437 | { |
438 | unsigned long base = bdata->node_min_pfn; | 438 | unsigned long base = bdata->node_min_pfn; |
439 | 439 | ||
@@ -445,8 +445,8 @@ static unsigned long align_idx(struct bootmem_data *bdata, unsigned long idx, | |||
445 | return ALIGN(base + idx, step) - base; | 445 | return ALIGN(base + idx, step) - base; |
446 | } | 446 | } |
447 | 447 | ||
448 | static unsigned long align_off(struct bootmem_data *bdata, unsigned long off, | 448 | static unsigned long __init align_off(struct bootmem_data *bdata, |
449 | unsigned long align) | 449 | unsigned long off, unsigned long align) |
450 | { | 450 | { |
451 | unsigned long base = PFN_PHYS(bdata->node_min_pfn); | 451 | unsigned long base = PFN_PHYS(bdata->node_min_pfn); |
452 | 452 | ||