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