From d4d5f1b50ac6433574d4ac086317c82787a81a97 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Thu, 26 Aug 2010 17:12:17 -0700
Subject: [PATCH] --- yaml --- r: 217845 b: refs/heads/master c:
 bbbf61eff92c7c236f57ee1953ad84055443717e h: refs/heads/master i:   217843:
 4a5162d57a9589317dd3595c44d803b9a2681c5e v: v3

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

diff --git a/[refs] b/[refs]
index 0c8cea789867..87951fc27e5a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f2d9dd309feb08fdbc711fa03841650dfff87d8
+refs/heads/master: bbbf61eff92c7c236f57ee1953ad84055443717e
diff --git a/trunk/arch/x86/xen/mmu.c b/trunk/arch/x86/xen/mmu.c
index fcff8c829799..00969099b057 100644
--- a/trunk/arch/x86/xen/mmu.c
+++ b/trunk/arch/x86/xen/mmu.c
@@ -275,8 +275,8 @@ unsigned long get_phys_to_machine(unsigned long pfn)
 }
 EXPORT_SYMBOL_GPL(get_phys_to_machine);
 
-/* install a  new p2m_top page */
-bool install_p2mtop_page(unsigned long pfn, unsigned long *p)
+/* install a new p2m_top page */
+static bool install_p2mtop_page(unsigned long pfn, unsigned long *p)
 {
 	unsigned topidx = p2m_top_index(pfn);
 	unsigned long **pfnp, *mfnp;
diff --git a/trunk/arch/x86/xen/mmu.h b/trunk/arch/x86/xen/mmu.h
index fa938c4aa2f7..537bb9aab777 100644
--- a/trunk/arch/x86/xen/mmu.h
+++ b/trunk/arch/x86/xen/mmu.h
@@ -12,7 +12,6 @@ enum pt_level {
 
 
 bool __set_phys_to_machine(unsigned long pfn, unsigned long mfn);
-bool install_p2mtop_page(unsigned long pfn, unsigned long *p);
 
 void set_pte_mfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags);