diff options
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/paravirt.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/vmi_32.c | 20 |
2 files changed, 0 insertions, 24 deletions
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index 1b1739d16310..1db183ed7c01 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c | |||
@@ -428,10 +428,6 @@ struct pv_mmu_ops pv_mmu_ops = { | |||
428 | .ptep_modify_prot_start = __ptep_modify_prot_start, | 428 | .ptep_modify_prot_start = __ptep_modify_prot_start, |
429 | .ptep_modify_prot_commit = __ptep_modify_prot_commit, | 429 | .ptep_modify_prot_commit = __ptep_modify_prot_commit, |
430 | 430 | ||
431 | #ifdef CONFIG_HIGHPTE | ||
432 | .kmap_atomic_pte = kmap_atomic, | ||
433 | #endif | ||
434 | |||
435 | #if PAGETABLE_LEVELS >= 3 | 431 | #if PAGETABLE_LEVELS >= 3 |
436 | #ifdef CONFIG_X86_PAE | 432 | #ifdef CONFIG_X86_PAE |
437 | .set_pte_atomic = native_set_pte_atomic, | 433 | .set_pte_atomic = native_set_pte_atomic, |
diff --git a/arch/x86/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c index 58aca86193e5..7dd599deca4a 100644 --- a/arch/x86/kernel/vmi_32.c +++ b/arch/x86/kernel/vmi_32.c | |||
@@ -267,22 +267,6 @@ static void vmi_nop(void) | |||
267 | { | 267 | { |
268 | } | 268 | } |
269 | 269 | ||
270 | #ifdef CONFIG_HIGHPTE | ||
271 | static void *vmi_kmap_atomic_pte(struct page *page, enum km_type type) | ||
272 | { | ||
273 | void *va = kmap_atomic(page, type); | ||
274 | |||
275 | /* | ||
276 | * We disable highmem allocations for page tables so we should never | ||
277 | * see any calls to kmap_atomic_pte on a highmem page. | ||
278 | */ | ||
279 | |||
280 | BUG_ON(PageHighmem(page)); | ||
281 | |||
282 | return va; | ||
283 | } | ||
284 | #endif | ||
285 | |||
286 | static void vmi_allocate_pte(struct mm_struct *mm, unsigned long pfn) | 270 | static void vmi_allocate_pte(struct mm_struct *mm, unsigned long pfn) |
287 | { | 271 | { |
288 | vmi_ops.allocate_page(pfn, VMI_PAGE_L1, 0, 0, 0); | 272 | vmi_ops.allocate_page(pfn, VMI_PAGE_L1, 0, 0, 0); |
@@ -777,10 +761,6 @@ static inline int __init activate_vmi(void) | |||
777 | 761 | ||
778 | /* Set linear is needed in all cases */ | 762 | /* Set linear is needed in all cases */ |
779 | vmi_ops.set_linear_mapping = vmi_get_function(VMI_CALL_SetLinearMapping); | 763 | vmi_ops.set_linear_mapping = vmi_get_function(VMI_CALL_SetLinearMapping); |
780 | #ifdef CONFIG_HIGHPTE | ||
781 | if (vmi_ops.set_linear_mapping) | ||
782 | pv_mmu_ops.kmap_atomic_pte = vmi_kmap_atomic_pte; | ||
783 | #endif | ||
784 | 764 | ||
785 | /* | 765 | /* |
786 | * These MUST always be patched. Don't support indirect jumps | 766 | * These MUST always be patched. Don't support indirect jumps |