aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/kvm
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2016-06-15 09:18:26 -0400
committerPaolo Bonzini <pbonzini@redhat.com>2016-07-01 05:03:21 -0400
commit6edaa5307f3f51e4e56dc4c63f68a69d88c6ddf5 (patch)
tree8466e2bf1da7bdce8bcbe1d728003422e6faa6da /arch/mips/kvm
parentebaac1736245e78109cd47d453a86a18dcfc94b8 (diff)
KVM: remove kvm_guest_enter/exit wrappers
Use the functions from context_tracking.h directly. Cc: Andy Lutomirski <luto@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Rik van Riel <riel@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/mips/kvm')
-rw-r--r--arch/mips/kvm/mips.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
index 5a2b9034a05c..5f1163653b50 100644
--- a/arch/mips/kvm/mips.c
+++ b/arch/mips/kvm/mips.c
@@ -406,7 +406,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
406 kvm_mips_deliver_interrupts(vcpu, 406 kvm_mips_deliver_interrupts(vcpu,
407 kvm_read_c0_guest_cause(vcpu->arch.cop0)); 407 kvm_read_c0_guest_cause(vcpu->arch.cop0));
408 408
409 __kvm_guest_enter(); 409 guest_enter_irqoff();
410 410
411 /* Disable hardware page table walking while in guest */ 411 /* Disable hardware page table walking while in guest */
412 htw_stop(); 412 htw_stop();
@@ -418,7 +418,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
418 /* Re-enable HTW before enabling interrupts */ 418 /* Re-enable HTW before enabling interrupts */
419 htw_start(); 419 htw_start();
420 420
421 __kvm_guest_exit(); 421 guest_exit_irqoff();
422 local_irq_enable(); 422 local_irq_enable();
423 423
424 if (vcpu->sigset_active) 424 if (vcpu->sigset_active)