From 0167f72fe5ec09c2902b9dfe58ac471833c145fc Mon Sep 17 00:00:00 2001
From: Gary Hade <garyhade@us.ibm.com>
Date: Mon, 19 Jan 2009 13:46:41 -0800
Subject: [PATCH] --- yaml --- r: 129959 b: refs/heads/master c:
 f5495506c3c1300d249d403c36f92de71920dbeb h: refs/heads/master i:   129957:
 77ba2631087f9980550acea99367920fa52ea858   129955:
 5b0274476b1a2bf349d11667fad1c055ee04d248   129951:
 02d577e5c0a8ab9aed5a8c002938b1b4cc8b7072 v: v3

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

diff --git a/[refs] b/[refs]
index af2383a539f5..b885d288471b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfa318ad52a23f1e303d176b44366cdd2bb71ad2
+refs/heads/master: f5495506c3c1300d249d403c36f92de71920dbeb
diff --git a/trunk/arch/x86/mm/init_64.c b/trunk/arch/x86/mm/init_64.c
index 23f68e77ad1f..e6d36b490250 100644
--- a/trunk/arch/x86/mm/init_64.c
+++ b/trunk/arch/x86/mm/init_64.c
@@ -596,7 +596,7 @@ static void __init init_gbpages(void)
 		direct_gbpages = 0;
 }
 
-static unsigned long __init kernel_physical_mapping_init(unsigned long start,
+static unsigned long __meminit kernel_physical_mapping_init(unsigned long start,
 						unsigned long end,
 						unsigned long page_size_mask)
 {