From e877910080a05ffabb1da50118053669ad62f12c Mon Sep 17 00:00:00 2001
From: Bharat Bhushan <r65777@freescale.com>
Date: Mon, 31 Oct 2011 14:22:08 +0530
Subject: [PATCH] --- yaml --- r: 297075 b: refs/heads/master c:
 7401f6266de021990efc7bc212289219ba8f9a7a h: refs/heads/master i:   297073:
 d976f62d28bd030e0567eb3e3ce128b37c3f493b   297071:
 0363bf39c4a07d55ea0a11f8b0bc9c68af726317 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/powerpc/kvm/emulate.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9af72a0b15ee..64f9b98ea159 100644
--- 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
index 4337f99fa0fa..b6df56dd93ba 100644
--- 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