diff options
Diffstat (limited to 'arch/x86/xen/mmu.c')
-rw-r--r-- | arch/x86/xen/mmu.c | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index f987bde77c49..3c9aecd09ed1 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
@@ -495,41 +495,6 @@ static pte_t xen_make_pte(pteval_t pte) | |||
495 | } | 495 | } |
496 | PV_CALLEE_SAVE_REGS_THUNK(xen_make_pte); | 496 | PV_CALLEE_SAVE_REGS_THUNK(xen_make_pte); |
497 | 497 | ||
498 | #ifdef CONFIG_XEN_DEBUG | ||
499 | pte_t xen_make_pte_debug(pteval_t pte) | ||
500 | { | ||
501 | phys_addr_t addr = (pte & PTE_PFN_MASK); | ||
502 | phys_addr_t other_addr; | ||
503 | bool io_page = false; | ||
504 | pte_t _pte; | ||
505 | |||
506 | if (pte & _PAGE_IOMAP) | ||
507 | io_page = true; | ||
508 | |||
509 | _pte = xen_make_pte(pte); | ||
510 | |||
511 | if (!addr) | ||
512 | return _pte; | ||
513 | |||
514 | if (io_page && | ||
515 | (xen_initial_domain() || addr >= ISA_END_ADDRESS)) { | ||
516 | other_addr = pfn_to_mfn(addr >> PAGE_SHIFT) << PAGE_SHIFT; | ||
517 | WARN_ONCE(addr != other_addr, | ||
518 | "0x%lx is using VM_IO, but it is 0x%lx!\n", | ||
519 | (unsigned long)addr, (unsigned long)other_addr); | ||
520 | } else { | ||
521 | pteval_t iomap_set = (_pte.pte & PTE_FLAGS_MASK) & _PAGE_IOMAP; | ||
522 | other_addr = (_pte.pte & PTE_PFN_MASK); | ||
523 | WARN_ONCE((addr == other_addr) && (!io_page) && (!iomap_set), | ||
524 | "0x%lx is missing VM_IO (and wasn't fixed)!\n", | ||
525 | (unsigned long)addr); | ||
526 | } | ||
527 | |||
528 | return _pte; | ||
529 | } | ||
530 | PV_CALLEE_SAVE_REGS_THUNK(xen_make_pte_debug); | ||
531 | #endif | ||
532 | |||
533 | static pgd_t xen_make_pgd(pgdval_t pgd) | 498 | static pgd_t xen_make_pgd(pgdval_t pgd) |
534 | { | 499 | { |
535 | pgd = pte_pfn_to_mfn(pgd); | 500 | pgd = pte_pfn_to_mfn(pgd); |
@@ -1988,9 +1953,6 @@ void __init xen_ident_map_ISA(void) | |||
1988 | 1953 | ||
1989 | static void __init xen_post_allocator_init(void) | 1954 | static void __init xen_post_allocator_init(void) |
1990 | { | 1955 | { |
1991 | #ifdef CONFIG_XEN_DEBUG | ||
1992 | pv_mmu_ops.make_pte = PV_CALLEE_SAVE(xen_make_pte_debug); | ||
1993 | #endif | ||
1994 | pv_mmu_ops.set_pte = xen_set_pte; | 1956 | pv_mmu_ops.set_pte = xen_set_pte; |
1995 | pv_mmu_ops.set_pmd = xen_set_pmd; | 1957 | pv_mmu_ops.set_pmd = xen_set_pmd; |
1996 | pv_mmu_ops.set_pud = xen_set_pud; | 1958 | pv_mmu_ops.set_pud = xen_set_pud; |