[Xen-changelog] [xen-unstable] Merge

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
# Date 1335351608 -3600
# Node ID 7ba11d9b1d23633b5c42fadddad17b6dcb686141
# Parent  841b7e3bd1f99f6a61fde8e2bf670a3327135184
# Parent  b7ce6a88bebbbd8d03fe50099ede8de4d9adef0f
Merge
---


diff -r 841b7e3bd1f9 -r 7ba11d9b1d23 xen/arch/x86/x86_64/mm.c
--- a/xen/arch/x86/x86_64/mm.c  Wed Apr 25 11:44:09 2012 +0100
+++ b/xen/arch/x86/x86_64/mm.c  Wed Apr 25 12:00:08 2012 +0100
@@ -454,7 +454,7 @@ static int setup_compat_m2p_table(struct
     if   ((smap > ((RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 
2)) )
         return 0;
 
-    if (epfn > (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START))
+    if ( epfn > ((RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2) 
)
         epfn = (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2;
 
     emap = ( (epfn + ((1UL << (L2_PAGETABLE_SHIFT - 2)) - 1 )) &

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