[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] page.h, init.c:
ChangeSet 1.1444, 2005/05/12 23:03:23+01:00, cl349@xxxxxxxxxxxxxxxxxxxx page.h, init.c: phys is machine physical already. So we shouldn't try to convert guest physical to machine physical. Signed-off-by: Arun Sharma <arun.sharma@xxxxxxxxx> Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx> arch/xen/x86_64/mm/init.c | 4 ++-- include/asm-xen/asm-x86_64/page.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c b/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c --- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c 2005-05-12 19:04:33 -04:00 +++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c 2005-05-12 19:04:33 -04:00 @@ -328,11 +328,11 @@ } } - new_pte = pfn_pte(phys >> PAGE_SHIFT, prot); + new_pte = pfn_pte_ma(phys >> PAGE_SHIFT, prot); pte = pte_offset_kernel(pmd, vaddr); if (!pte_none(*pte) && - pte_val(*pte) != (pte_val(new_pte) & __supported_pte_mask)) + pte_val_ma(*pte) != (pte_val_ma(new_pte) & __supported_pte_mask)) pte_ERROR(*pte); /* diff -Nru a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/page.h b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/page.h --- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/page.h 2005-05-12 19:04:33 -04:00 +++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/page.h 2005-05-12 19:04:33 -04:00 @@ -92,6 +92,7 @@ #define pte_val(x) (((x).pte & 1) ? machine_to_phys((x).pte) : \ (x).pte) +#define pte_val_ma(x) ((x).pte) static inline unsigned long pmd_val(pmd_t x) { _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |