From 9cf41001c4203d68c8b72cbbeb58314214cecc43 Mon Sep 17 00:00:00 2001
From: Jan Beulich <JBeulich@novell.com>
Date: Mon, 14 Dec 2009 17:59:46 -0800
Subject: [PATCH] --- yaml --- r: 176306 b: refs/heads/master c:
 8aa043d74559556a661cb2eb6e64497eec86ec77 h: refs/heads/master v: v3

---
 [refs]             | 2 +-
 trunk/mm/bootmem.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index dfd2b9c77181..f70217bfb4f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ae49fab239fb49de92a657c7426271e0793c4e1
+refs/heads/master: 8aa043d74559556a661cb2eb6e64497eec86ec77
diff --git a/trunk/mm/bootmem.c b/trunk/mm/bootmem.c
index d1dc23cc7f10..7d1486875e1c 100644
--- a/trunk/mm/bootmem.c
+++ b/trunk/mm/bootmem.c
@@ -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);