diff options
| author | Christian Borntraeger <borntraeger@de.ibm.com> | 2015-04-30 13:43:31 +0200 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-05-24 11:10:08 +0800 |
| commit | cc84e6536d0d40917a74e3204b3ba61e360e4fb6 (patch) | |
| tree | 3cde11bbbae2752c6760298ecd05b45110a4593e /arch/mips | |
| parent | e0497e5362b9fa13bbd0cdb43ea5d7739a919e22 (diff) | |
KVM: arm/mips/x86/power use __kvm_guest_{enter|exit}
Use __kvm_guest_{enter|exit} instead of kvm_guest_{enter|exit}
where interrupts are disabled.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit ccf73aaf5adfa37f45be12459c17f534e8f2c2c5)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/kvm/mips.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c index ace4ed7d41c6..3e12912ce828 100644 --- a/arch/mips/kvm/mips.c +++ b/arch/mips/kvm/mips.c @@ -396,7 +396,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) kvm_mips_deliver_interrupts(vcpu, kvm_read_c0_guest_cause(vcpu->arch.cop0)); - kvm_guest_enter(); + __kvm_guest_enter(); /* Disable hardware page table walking while in guest */ htw_stop(); @@ -406,7 +406,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) /* Re-enable HTW before enabling interrupts */ htw_start(); - kvm_guest_exit(); + __kvm_guest_exit(); local_irq_enable(); if (vcpu->sigset_active) |