Merge branch 'linus' into x86/xen
[linux-3.10.git] / arch / x86 / xen / mmu.c
index 4fa0934..7c99358 100644 (file)
@@ -185,7 +185,7 @@ xmaddr_t arbitrary_virt_to_machine(unsigned long address)
 {
        unsigned int level;
        pte_t *pte = lookup_address(address, &level);
-       unsigned offset = address & PAGE_MASK;
+       unsigned offset = address & ~PAGE_MASK;
 
        BUG_ON(pte == NULL);