From d80c44e0cd952f6dd62e07271ef0a1274b0b4a41 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 7 Mar 2012 14:44:35 +0100
Subject: [PATCH] --- yaml --- r: 292781 b: refs/heads/master c:
 a5c2edf5765a6efedfd862bce6c616bfec46306a h: refs/heads/master i:   292779:
 824aecbabb00851a0cb33222ceeb2f1ccd80dc30 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/mm/numa_emulation.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 735e8b42e082..dc913c5c42e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b11e3d782b9c065b3b2fb543bfb0d97801822dc0
+refs/heads/master: a5c2edf5765a6efedfd862bce6c616bfec46306a
diff --git a/trunk/arch/x86/mm/numa_emulation.c b/trunk/arch/x86/mm/numa_emulation.c
index 46db56845f18..2fff6518e302 100644
--- a/trunk/arch/x86/mm/numa_emulation.c
+++ b/trunk/arch/x86/mm/numa_emulation.c
@@ -28,7 +28,7 @@ static int __init emu_find_memblk_by_nid(int nid, const struct numa_meminfo *mi)
 	return -ENOENT;
 }
 
-static u64 mem_hole_size(u64 start, u64 end)
+static u64 __init mem_hole_size(u64 start, u64 end)
 {
 	unsigned long start_pfn = PFN_UP(start);
 	unsigned long end_pfn = PFN_DOWN(end);