[Xen-changelog] [xen-unstable] Revert 24283:3bc4dfb54666

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Tim Deegan <tim@xxxxxxx>
# Date 1322752066 0
# Node ID 5cd1bd1bf8135a30c4a987926dcaf7437b856821
# Parent  acfd86abd08b91bc97a5d4a5f10ee81c8e243a4a
Revert 24283:3bc4dfb54666

This fixes the 32-bit build

Signed-off-by: Tim Deegan <tim@xxxxxxx>
---


diff -r acfd86abd08b -r 5cd1bd1bf813 xen/include/asm-x86/page.h
--- a/xen/include/asm-x86/page.h        Thu Dec 01 14:56:43 2011 +0000
+++ b/xen/include/asm-x86/page.h        Thu Dec 01 15:07:46 2011 +0000
@@ -272,7 +272,6 @@
 #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 -r acfd86abd08b -r 5cd1bd1bf813 xen/include/asm-x86/x86_32/page.h
--- a/xen/include/asm-x86/x86_32/page.h Thu Dec 01 14:56:43 2011 +0000
+++ b/xen/include/asm-x86/x86_32/page.h Thu Dec 01 15:07:46 2011 +0000
@@ -71,17 +71,6 @@
     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 -r acfd86abd08b -r 5cd1bd1bf813 xen/include/asm-x86/x86_64/page.h
--- a/xen/include/asm-x86/x86_64/page.h Thu Dec 01 14:56:43 2011 +0000
+++ b/xen/include/asm-x86/x86_64/page.h Thu Dec 01 15:07:46 2011 +0000
@@ -104,11 +104,6 @@
                      ((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"

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog