aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kvm/booke.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/kvm/booke.c')
-rw-r--r--arch/powerpc/kvm/booke.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index 557f028a9ad4..8dfc59a8a715 100644
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -285,7 +285,6 @@ static int kvmppc_booke_irqprio_deliver(struct kvm_vcpu *vcpu,
285static void kvmppc_core_check_exceptions(struct kvm_vcpu *vcpu) 285static void kvmppc_core_check_exceptions(struct kvm_vcpu *vcpu)
286{ 286{
287 unsigned long *pending = &vcpu->arch.pending_exceptions; 287 unsigned long *pending = &vcpu->arch.pending_exceptions;
288 unsigned long old_pending = vcpu->arch.pending_exceptions;
289 unsigned int priority; 288 unsigned int priority;
290 289
291 priority = __ffs(*pending); 290 priority = __ffs(*pending);
@@ -299,10 +298,7 @@ static void kvmppc_core_check_exceptions(struct kvm_vcpu *vcpu)
299 } 298 }
300 299
301 /* Tell the guest about our interrupt status */ 300 /* Tell the guest about our interrupt status */
302 if (*pending) 301 vcpu->arch.shared->int_pending = !!*pending;
303 vcpu->arch.shared->int_pending = 1;
304 else if (old_pending)
305 vcpu->arch.shared->int_pending = 0;
306} 302}
307 303
308/* Check pending exceptions and deliver one, if possible. */ 304/* Check pending exceptions and deliver one, if possible. */