---

yaml --- r: 297075 b: refs/heads/master c: 7401f62 h: refs/heads/master i: 297073: d976f62 297071: 0363bf3 v: v3
git-mirror · Mar 5, 2012 · e877910 · e877910
1 parent 7f998b9
commit e877910
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc2babfea592e633cf3890294af6545609b466be
+refs/heads/master: 7401f6266de021990efc7bc212289219ba8f9a7a
diff --git a/trunk/arch/powerpc/kvm/emulate.c b/trunk/arch/powerpc/kvm/emulate.c
@@ -77,7 +77,8 @@ static int kvmppc_dec_enabled(struct kvm_vcpu *vcpu)
 #else
 static int kvmppc_dec_enabled(struct kvm_vcpu *vcpu)
 {
-	return vcpu->arch.tcr & TCR_DIE;
+	/* On BOOKE, DEC = 0 is as good as decrementer not enabled */
+	return (vcpu->arch.tcr & TCR_DIE) && vcpu->arch.dec;
 }
 #endif