diff options
| author | Christian Borntraeger <borntraeger@de.ibm.com> | 2015-04-30 13:43:31 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-05-07 11:28:22 +0200 |
| commit | ccf73aaf5adfa37f45be12459c17f534e8f2c2c5 (patch) | |
| tree | 52d529598a2f304cf3b0fcb581f00a789472ae7d /arch/arm/kvm | |
| parent | 0097d12e504b3ce57b68810737ad6a5a64a98c68 (diff) | |
| download | op-kernel-dev-ccf73aaf5adfa37f45be12459c17f534e8f2c2c5.zip op-kernel-dev-ccf73aaf5adfa37f45be12459c17f534e8f2c2c5.tar.gz | |
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>
Diffstat (limited to 'arch/arm/kvm')
| -rw-r--r-- | arch/arm/kvm/arm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index d9631ec..e41cb11 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -553,13 +553,13 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) * Enter the guest */ trace_kvm_entry(*vcpu_pc(vcpu)); - kvm_guest_enter(); + __kvm_guest_enter(); vcpu->mode = IN_GUEST_MODE; ret = kvm_call_hyp(__kvm_vcpu_run, vcpu); vcpu->mode = OUTSIDE_GUEST_MODE; - kvm_guest_exit(); + __kvm_guest_exit(); trace_kvm_exit(kvm_vcpu_trap_get_class(vcpu), *vcpu_pc(vcpu)); /* * We may have taken a host interrupt in HYP mode (ie |
