summaryrefslogtreecommitdiffstats
path: root/arch/s390/kvm/vsie.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2016-06-15 15:18:26 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2016-07-01 11:03:21 +0200
commit6edaa5307f3f51e4e56dc4c63f68a69d88c6ddf5 (patch)
tree8466e2bf1da7bdce8bcbe1d728003422e6faa6da /arch/s390/kvm/vsie.c
parentcontext_tracking: move rcu_virt_note_context_switch out of kvm_host.h (diff)
downloadlinux-6edaa5307f3f51e4e56dc4c63f68a69d88c6ddf5.tar.xz
linux-6edaa5307f3f51e4e56dc4c63f68a69d88c6ddf5.zip
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/s390/kvm/vsie.c')
-rw-r--r--arch/s390/kvm/vsie.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c
index 6895e7b3be12..c106488b4137 100644
--- a/arch/s390/kvm/vsie.c
+++ b/arch/s390/kvm/vsie.c
@@ -765,13 +765,13 @@ static int do_vsie_run(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)
srcu_read_unlock(&vcpu->kvm->srcu, vcpu->srcu_idx);
local_irq_disable();
- kvm_guest_enter();
+ guest_enter_irqoff();
local_irq_enable();
rc = sie64a(scb_s, vcpu->run->s.regs.gprs);
local_irq_disable();
- kvm_guest_exit();
+ guest_exit_irqoff();
local_irq_enable();
vcpu->srcu_idx = srcu_read_lock(&vcpu->kvm->srcu);