Message ID | 1391630151-7875-9-git-send-email-marc.zyngier@arm.com |
---|---|
State | Superseded |
Headers | show |
On Wed, Feb 05, 2014 at 07:55:48PM +0000, Marc Zyngier wrote: > Commit 240e99cbd00a (ARM: KVM: Fix 64-bit coprocessor handling) > added an ordering dependency for the 64bit registers. > > The order described is: CRn, CRm, Op1, Op2, 64bit-first. > > Unfortunately, the implementation is: CRn, 64bit-first, CRm... > > Move the 64bit test to be last in order to match the documentation. > > Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> > Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org> Acked-by: Catalin Marinas <catalin.marinas@arm.com>
diff --git a/arch/arm/kvm/coproc.h b/arch/arm/kvm/coproc.h index c5ad7ff..8dda870 100644 --- a/arch/arm/kvm/coproc.h +++ b/arch/arm/kvm/coproc.h @@ -135,13 +135,13 @@ static inline int cmp_reg(const struct coproc_reg *i1, return -1; if (i1->CRn != i2->CRn) return i1->CRn - i2->CRn; - if (i1->is_64 != i2->is_64) - return i2->is_64 - i1->is_64; if (i1->CRm != i2->CRm) return i1->CRm - i2->CRm; if (i1->Op1 != i2->Op1) return i1->Op1 - i2->Op1; - return i1->Op2 - i2->Op2; + if (i1->Op2 != i2->Op2) + return i1->Op2 - i2->Op2; + return i2->is_64 - i1->is_64; }