diff options
| author | Alexander Graf <agraf@suse.de> | 2012-08-13 01:24:01 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2012-10-05 23:38:45 +0200 |
| commit | 3766a4c693358cff33441310413e3776dbbf8ef0 (patch) | |
| tree | 997f7964fbd5eb0abbf301eff1bb33565ab6be79 /arch/powerpc/kvm/powerpc.c | |
| parent | KVM: PPC: Book3S: PR: Rework irq disabling (diff) | |
| download | linux-3766a4c693358cff33441310413e3776dbbf8ef0.tar.xz linux-3766a4c693358cff33441310413e3776dbbf8ef0.zip | |
KVM: PPC: Move kvm_guest_enter call into generic code
We need to call kvm_guest_enter in booke and book3s, so move its
call to generic code.
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'arch/powerpc/kvm/powerpc.c')
| -rw-r--r-- | arch/powerpc/kvm/powerpc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index 266549979e9f..6646574bf930 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -101,12 +101,15 @@ int kvmppc_prepare_to_enter(struct kvm_vcpu *vcpu) /* Got an interrupt in between, try again */ local_irq_enable(); local_irq_disable(); + kvm_guest_exit(); continue; } trace_hardirqs_on(); #endif + kvm_guest_enter(); + /* Going into guest context! Yay! */ vcpu->mode = IN_GUEST_MODE; smp_wmb(); |