25 lines
948 B
Diff
25 lines
948 B
Diff
|
# HG changeset patch
|
||
|
|
# User Jan Beulich <jbeulich@novell.com>
|
||
|
|
# Date 1308165849 -3600
|
||
|
|
# Node ID a8edfacd4b5e2cecb78d2ff93e57e7efa1bf2db2
|
||
|
|
# Parent 23c068b109236657ededa3e3b7f180346a5cd9f9
|
||
|
|
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@novell.com>
|
||
|
|
|
||
|
|
--- a/xen/include/asm-x86/x86_64/page.h
|
||
|
|
+++ b/xen/include/asm-x86/x86_64/page.h
|
||
|
|
@@ -95,7 +95,7 @@ static inline unsigned long __virt_to_ma
|
||
|
|
|
||
|
|
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)));
|