From 71b830f18a4f3561caf1e9c4164fda28808205f7 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Thu, 24 Mar 2011 14:26:51 +0000
Subject: [PATCH] --- yaml --- r: 252096 b: refs/heads/master c:
 f05608d278633988db39058a8649fe90e30e6194 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/xen/mmu.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8bec981d5764..8811d78bfdb2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c86d8077b3ec048e42e26372b02dae26b38b0d6b
+refs/heads/master: f05608d278633988db39058a8649fe90e30e6194
diff --git a/trunk/arch/x86/xen/mmu.c b/trunk/arch/x86/xen/mmu.c
index eb6d83a458c9..c03101e47425 100644
--- a/trunk/arch/x86/xen/mmu.c
+++ b/trunk/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);