From: Tim Deegan <tim@xen.org>
Date: Thu, 1 Dec 2011 15:07:46 +0000 (+0000)
Subject: Revert 24283:3bc4dfb54666
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a0d47e29cbb22e65def4fc587a63a9f17ac8c4e7;p=xen.git

Revert 24283:3bc4dfb54666

This fixes the 32-bit build

Signed-off-by: Tim Deegan <tim@xen.org>
---

diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h
index 666fb3ffd0..59b42cc348 100644
--- a/xen/include/asm-x86/page.h
+++ b/xen/include/asm-x86/page.h
@@ -272,7 +272,6 @@ void copy_page_sse2(void *, const void *);
 #define pfn_to_paddr(pfn)   __pfn_to_paddr(pfn)
 #define paddr_to_pfn(pa)    __paddr_to_pfn(pa)
 #define paddr_to_pdx(pa)    pfn_to_pdx(paddr_to_pfn(pa))
-#define xen_map_to_mfn(va)  __xen_map_to_mfn(va)
 
 #endif /* !defined(__ASSEMBLY__) */
 
diff --git a/xen/include/asm-x86/x86_32/page.h b/xen/include/asm-x86/x86_32/page.h
index fa268eff78..9b2c7733cf 100644
--- a/xen/include/asm-x86/x86_32/page.h
+++ b/xen/include/asm-x86/x86_32/page.h
@@ -71,17 +71,6 @@ static inline void *__maddr_to_virt(unsigned long ma)
     return (void *)(ma + DIRECTMAP_VIRT_START);
 }
 
-static inline unsigned long __xen_map_to_mfn(void *va)
-{
-    l1_pgentry_t *l1e;
-
-    ASSERT( (((unsigned long) va) >= MAPCACHE_VIRT_START) &&
-            (((unsigned long) va) <= MAPCACHE_VIRT_END) );
-    l1e = &__linear_l1_table[
-            l1_linear_offset((unsigned long) va)];
-    return l1e_get_pfn(*l1e);
-}
-
 /* read access (should only be used for debug printk's) */
 typedef u64 intpte_t;
 #define PRIpte "016llx"
diff --git a/xen/include/asm-x86/x86_64/page.h b/xen/include/asm-x86/x86_64/page.h
index 7fe831bf6d..2f46ba2c5a 100644
--- a/xen/include/asm-x86/x86_64/page.h
+++ b/xen/include/asm-x86/x86_64/page.h
@@ -104,11 +104,6 @@ static inline void *__maddr_to_virt(unsigned long ma)
                      ((ma & ma_top_mask) >> pfn_pdx_hole_shift)));
 }
 
-static inline unsigned long __xen_map_to_mfn(void *va)
-{
-    return (__virt_to_maddr((unsigned long) va) >> PAGE_SHIFT);
-}
-
 /* read access (should only be used for debug printk's) */
 typedef u64 intpte_t;
 #define PRIpte "016lx"