Re: [Xen-devel] [xen-unstable test] 11825: regressions - FAIL

[Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>]

Ian Jackson writes ("Re: [xen-unstable test] 11825: regressions - FAIL"):
> memory.c: In function 'guest_remove_page':
> memory.c:192: error: implicit declaration of function 
> 'mem_sharing_unshare_page'
> memory.c:192: error: nested extern declaration of 'mem_sharing_unshare_page'
> make[4]: *** [memory.o] Error 1
> make[4]: Leaving directory 
> `/home/osstest/build.11825.build-i386/xen-unstable/xen/common'
> make[3]: *** 
> [/home/osstest/build.11825.build-i386/xen-unstable/xen/common/built_in.o] 
> Error 2

The patch below fixes it for me, but I'm not sure whether replacing
CONFIG_X86 with __x86_64__ is proper.


x86/mm: Fix 32-bit build by disabling some memory sharing code

Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>

diff -r dcc6d57e4c07 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:49:50 2012 +0000
@@ -182,7 +182,7 @@ int guest_remove_page(struct domain *d, 
     }
             
     page = mfn_to_page(mfn);
-#ifdef CONFIG_X86
+#ifdef __x86_64__
     if ( p2m_is_shared(p2mt) )
     {
         /* Unshare the page, bail out on error. We unshare because 

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