---

yaml --- r: 215839 b: refs/heads/master c: 9ee18b1 h: refs/heads/master i: 215837: b3740ef 215835: acfb5ac 215831: 4dc05a4 215823: c726cda 215807: 499f630 v: v3
git-mirror · Oct 24, 2010 · 9935b60 · 9935b60
1 parent 7252d6c
commit 9935b60
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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)