From 9935b60867f45b37d6988b3a7715e56a1bd080eb Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Thu, 5 Aug 2010 12:24:40 +0200
Subject: [PATCH] --- yaml --- r: 215839 b: refs/heads/master c:
 9ee18b1e08e6a5648aeaaf998eabc72b5304cc17 h: refs/heads/master i:   215837:
 b3740efcb89de67260c6fdc30ccc3bc3903d2bb8   215835:
 acfb5ac471f1180d5e9ae16344009906356f73cd   215831:
 4dc05a43506dc43ff6f70a0959fcebf0462a0639   215823:
 c726cda2c0787737be3805d833b7ea54ce6ca096   215807:
 499f63008a1eb2315bb21135f371b6266ef4f0b8 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/powerpc/kvm/book3s.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c6ad7c01f67f..aa005e09f1e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 512ba59ed9c580b5e5575beda0041bb19a641127
+refs/heads/master: 9ee18b1e08e6a5648aeaaf998eabc72b5304cc17
diff --git a/trunk/arch/powerpc/kvm/book3s.c b/trunk/arch/powerpc/kvm/book3s.c
index 02a9cb165d53..7adea6320654 100644
--- a/trunk/arch/powerpc/kvm/book3s.c
+++ b/trunk/arch/powerpc/kvm/book3s.c
@@ -201,6 +201,9 @@ static void kvmppc_book3s_dequeue_irqprio(struct kvm_vcpu *vcpu,
 {
 	clear_bit(kvmppc_book3s_vec2irqprio(vec),
 		  &vcpu->arch.pending_exceptions);
+
+	if (!vcpu->arch.pending_exceptions)
+		vcpu->arch.shared->int_pending = 0;
 }
 
 void kvmppc_book3s_queue_irqprio(struct kvm_vcpu *vcpu, unsigned int vec)