[Xen-changelog] [xen-4.1-testing] x86-64: fix incorrect assertion in __maddr_to_virt()

[Xen patchbot-4.1-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxxxx>
# Date 1308167154 -3600
# Node ID ed4f19a768600b7d56587c4d8e799bd775b89cd5
# Parent  1980763433607fb28e5857850954b3d05e71d899
x86-64: fix incorrect assertion in __maddr_to_virt()

When memory map sparseness reduction is in use, machine address ranges
can't validly be compared directly against the total size of the
direct mapping range.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
xen-unstable changeset:   23543:a8edfacd4b5e
xen-unstable date:        Wed Jun 15 20:24:09 2011 +0100
---


diff -r 198076343360 -r ed4f19a76860 xen/include/asm-x86/x86_64/page.h
--- a/xen/include/asm-x86/x86_64/page.h Wed Jun 15 20:45:20 2011 +0100
+++ b/xen/include/asm-x86/x86_64/page.h Wed Jun 15 20:45:54 2011 +0100
@@ -95,7 +95,7 @@
 
 static inline void *__maddr_to_virt(unsigned long ma)
 {
-    ASSERT(ma < DIRECTMAP_VIRT_END - DIRECTMAP_VIRT_START);
+    ASSERT(pfn_to_pdx(ma >> PAGE_SHIFT) < (DIRECTMAP_SIZE >> PAGE_SHIFT));
     return (void *)(DIRECTMAP_VIRT_START +
                     ((ma & ma_va_bottom_mask) |
                      ((ma & ma_top_mask) >> pfn_pdx_hole_shift)));

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