[Xen-changelog] [xen-unstable] Fix x86_32 build

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Tim Deegan <tim@xxxxxxx>
# Date 1328197646 0
# Node ID 3432abcf9380d3840ca38439a304f74a37d155fc
# Parent  dcc6d57e4c07728693c685a2cfa7f094ef726267
Fix x86_32 build

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


diff -r dcc6d57e4c07 -r 3432abcf9380 xen/common/memory.c
--- a/xen/common/memory.c       Thu Feb 02 15:28:58 2012 +0000
+++ b/xen/common/memory.c       Thu Feb 02 15:47:26 2012 +0000
@@ -182,7 +182,7 @@
     }
             
     page = mfn_to_page(mfn);
-#ifdef CONFIG_X86
+#ifdef CONFIG_X86_64
     if ( p2m_is_shared(p2mt) )
     {
         /* Unshare the page, bail out on error. We unshare because 
@@ -192,8 +192,8 @@
         if ( mem_sharing_unshare_page(d, gmfn, 0) )
             return 0;
     }
+#endif /* CONFIG_X86_64 */
 
-#endif /* CONFIG_X86 */
     if ( unlikely(!get_page(page, d)) )
     {
         put_gfn(d, gmfn);

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