From 49c401f3156579681b8ec39fa435542b331209e9 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Thu, 24 Mar 2011 13:34:32 -0700
Subject: [PATCH] --- yaml --- r: 243387 b: refs/heads/master c:
 b83c6e55ac482f08984504d61382ecf05f0afe32 h: refs/heads/master i:   243385:
 162d8b5e859e6cea6fec67c411eddd4f0c6ee8c1   243383:
 265c0dfcf6dbb89a67a4b0cbae52ac8c794a5dcf v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/xen/p2m.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ab3fe1b0f178..9c3583ef1a95 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b254244d2682fe975630f176c25a4444cc4e088d
+refs/heads/master: b83c6e55ac482f08984504d61382ecf05f0afe32
diff --git a/trunk/arch/x86/xen/p2m.c b/trunk/arch/x86/xen/p2m.c
index 2a44edd606e5..141eb0de8b06 100644
--- a/trunk/arch/x86/xen/p2m.c
+++ b/trunk/arch/x86/xen/p2m.c
@@ -497,7 +497,7 @@ static bool alloc_p2m(unsigned long pfn)
 	return true;
 }
 
-bool __early_alloc_p2m(unsigned long pfn)
+static bool __init __early_alloc_p2m(unsigned long pfn)
 {
 	unsigned topidx, mididx, idx;
 
@@ -530,7 +530,7 @@ bool __early_alloc_p2m(unsigned long pfn)
 	}
 	return idx != 0;
 }
-unsigned long set_phys_range_identity(unsigned long pfn_s,
+unsigned long __init set_phys_range_identity(unsigned long pfn_s,
 				      unsigned long pfn_e)
 {
 	unsigned long pfn;