| Submitter | Alexander Graf |
|---|---|
| Date | Jan. 4, 2012, 1:10 a.m. |
| Message ID | <1325639448-9494-13-git-send-email-agraf@suse.de> |
| Download | mbox | patch |
| Permalink | /patch/134174/ |
| State | New |
| Headers | show |
Comments
Patch
diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c index 4337f99..b6df56d 100644 --- a/arch/powerpc/kvm/emulate.c +++ b/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