From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Wed, 6 Apr 2011 23:43:33 +0000 (-0700)
Subject: Use arbitrary_virt_to_machine() to deal with ioremapped pud updates.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2a001f6482643239b8a069df5c2bdb2082c98be4;p=linux-beck.git

Use arbitrary_virt_to_machine() to deal with ioremapped pud updates.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
---

diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index c03101e47425..083b835d2dd0 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -518,7 +518,7 @@ static void xen_set_pud_hyper(pud_t *ptr, pud_t val)
 	xen_mc_batch();
 
 	/* ptr may be ioremapped for 64-bit pagetable setup */
-	u.ptr = virt_to_machine(ptr).maddr;
+	u.ptr = arbitrary_virt_to_machine(ptr).maddr;
 	u.val = pud_val_ma(val);
 	xen_extend_mmu_update(&u);