From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Thu, 24 Mar 2011 14:26:51 +0000 (+0000)
Subject: Use arbitrary_virt_to_machine() to deal with ioremapped pmd updates.
X-Git-Tag: v3.0-rc1~52^2~2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f05608d278633988db39058a8649fe90e30e6194;p=pandora-kernel.git

Use arbitrary_virt_to_machine() to deal with ioremapped pmd 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 eb6d83a458c9..c03101e47425 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -233,7 +233,7 @@ static void xen_set_pmd_hyper(pmd_t *ptr, pmd_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 = pmd_val_ma(val);
 	xen_extend_mmu_update(&u);