diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-21 16:35:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-21 16:35:37 -0700 |
| commit | 69bbe136a911bd5d45d0e633daaeb9d1239bf54f (patch) | |
| tree | 465daf241ea19bd0dca4f5a2b6d7862312be9ad9 /arch/arm/kvm/coproc.h | |
| parent | da2ad2a2c31fb07a6405e2e6706be171c5a41bc7 (diff) | |
| parent | c566ccfcb30e236636085317a05cb3e8808e7f4a (diff) | |
| download | op-kernel-dev-69bbe136a911bd5d45d0e633daaeb9d1239bf54f.zip op-kernel-dev-69bbe136a911bd5d45d0e633daaeb9d1239bf54f.tar.gz | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull kvm fixes from Paolo Bonzini:
"Fixes for ARM and aarch64.
This pull request is coming a bit later than I would have preferred,
because I and Gleb happened to have holidays around the same weeks of
August... sorry about that"
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: ARM: Squash len warning
arm64: KVM: use 'int' instead of 'u32' for variable 'target' in kvm_host.h.
arm64: KVM: add missing dsb before invalidating Stage-2 TLBs
arm64: KVM: perform save/restore of PAR_EL1
arm64: KVM: fix 2-level page tables unmapping
ARM: KVM: Fix unaligned unmap_range leak
ARM: KVM: Fix 64-bit coprocessor handling
Diffstat (limited to 'arch/arm/kvm/coproc.h')
| -rw-r--r-- | arch/arm/kvm/coproc.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/kvm/coproc.h b/arch/arm/kvm/coproc.h index b7301d3..0461d5c 100644 --- a/arch/arm/kvm/coproc.h +++ b/arch/arm/kvm/coproc.h @@ -135,6 +135,8 @@ 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) @@ -145,6 +147,7 @@ static inline int cmp_reg(const struct coproc_reg *i1, #define CRn(_x) .CRn = _x #define CRm(_x) .CRm = _x +#define CRm64(_x) .CRn = _x, .CRm = 0 #define Op1(_x) .Op1 = _x #define Op2(_x) .Op2 = _x #define is64 .is_64 = true |
