Merge branch 'for-rc1/xen/core' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-3.10.git] / arch / x86 / xen / mmu.c
index c3061d318da886d29cdee39a00df752dfb314d51..9842b12124078f9795413a31e784dd96a1fc28a0 100644 (file)
@@ -1798,7 +1798,7 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
 }
 #endif /* CONFIG_X86_64 */
 
-static void xen_set_fixmap(unsigned idx, unsigned long phys, pgprot_t prot)
+static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot)
 {
        pte_t pte;