diff options
author | Ian Campbell <ian.campbell@citrix.com> | 2010-02-26 12:16:02 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-27 17:41:35 -0500 |
commit | dad52fc01161afcb8798c609e009aed4d104927f (patch) | |
tree | 6d31060cc3e484898c3f503204cdfc52cb5d4e03 /arch/x86/xen | |
parent | 3249b7e1df6380e9d7bb3238f64f445bf614f787 (diff) |
x86, paravirt: Remove kmap_atomic_pte paravirt op.
Now that both Xen and VMI disable allocations of PTE pages from high
memory this paravirt op serves no further purpose.
This effectively reverts ce6234b5 "add kmap_atomic_pte for mapping
highpte pages".
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
LKML-Reference: <1267204562-11844-3-git-send-email-ian.campbell@citrix.com>
Acked-by: Alok Kataria <akataria@vmware.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/xen')
-rw-r--r-- | arch/x86/xen/mmu.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 350a3deedf25..f9eb7de74f42 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
@@ -1427,24 +1427,6 @@ static void xen_pgd_free(struct mm_struct *mm, pgd_t *pgd) | |||
1427 | #endif | 1427 | #endif |
1428 | } | 1428 | } |
1429 | 1429 | ||
1430 | #ifdef CONFIG_HIGHPTE | ||
1431 | static void *xen_kmap_atomic_pte(struct page *page, enum km_type type) | ||
1432 | { | ||
1433 | pgprot_t prot = PAGE_KERNEL; | ||
1434 | |||
1435 | /* | ||
1436 | * We disable highmem allocations for page tables so we should never | ||
1437 | * see any calls to kmap_atomic_pte on a highmem page. | ||
1438 | */ | ||
1439 | BUG_ON(PageHighMem(page)); | ||
1440 | |||
1441 | if (PagePinned(page)) | ||
1442 | prot = PAGE_KERNEL_RO; | ||
1443 | |||
1444 | return kmap_atomic_prot(page, type, prot); | ||
1445 | } | ||
1446 | #endif | ||
1447 | |||
1448 | #ifdef CONFIG_X86_32 | 1430 | #ifdef CONFIG_X86_32 |
1449 | static __init pte_t mask_rw_pte(pte_t *ptep, pte_t pte) | 1431 | static __init pte_t mask_rw_pte(pte_t *ptep, pte_t pte) |
1450 | { | 1432 | { |
@@ -1903,10 +1885,6 @@ static const struct pv_mmu_ops xen_mmu_ops __initdata = { | |||
1903 | .alloc_pmd_clone = paravirt_nop, | 1885 | .alloc_pmd_clone = paravirt_nop, |
1904 | .release_pmd = xen_release_pmd_init, | 1886 | .release_pmd = xen_release_pmd_init, |
1905 | 1887 | ||
1906 | #ifdef CONFIG_HIGHPTE | ||
1907 | .kmap_atomic_pte = xen_kmap_atomic_pte, | ||
1908 | #endif | ||
1909 | |||
1910 | #ifdef CONFIG_X86_64 | 1888 | #ifdef CONFIG_X86_64 |
1911 | .set_pte = xen_set_pte, | 1889 | .set_pte = xen_set_pte, |
1912 | #else | 1890 | #else |