diff options
| author | Cornelia Huck | 2020-02-18 15:44:59 +0100 |
|---|---|---|
| committer | Cornelia Huck | 2020-02-26 18:57:07 +0100 |
| commit | ddda37483dd17c9936fdde9ebf8f6ca2692b3842 (patch) | |
| tree | 27108b68eaaee373d3dc3f20193c4308d5712b5e /linux-headers/asm-arm64/kvm.h | |
| parent | target/s390x/translate: Fix RNSBG instruction (diff) | |
| download | qemu-ddda37483dd17c9936fdde9ebf8f6ca2692b3842.tar.gz qemu-ddda37483dd17c9936fdde9ebf8f6ca2692b3842.tar.xz qemu-ddda37483dd17c9936fdde9ebf8f6ca2692b3842.zip | |
linux-headers: update
Update to commit b1da3acc781c ("Merge tag 'ecryptfs-5.6-rc3-fixes' of
git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs")
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'linux-headers/asm-arm64/kvm.h')
| -rw-r--r-- | linux-headers/asm-arm64/kvm.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/linux-headers/asm-arm64/kvm.h b/linux-headers/asm-arm64/kvm.h index 920af01c8b..9e34f0f875 100644 --- a/linux-headers/asm-arm64/kvm.h +++ b/linux-headers/asm-arm64/kvm.h @@ -220,10 +220,18 @@ struct kvm_vcpu_events { #define KVM_REG_ARM_PTIMER_CVAL ARM64_SYS_REG(3, 3, 14, 2, 2) #define KVM_REG_ARM_PTIMER_CNT ARM64_SYS_REG(3, 3, 14, 0, 1) -/* EL0 Virtual Timer Registers */ +/* + * EL0 Virtual Timer Registers + * + * WARNING: + * KVM_REG_ARM_TIMER_CVAL and KVM_REG_ARM_TIMER_CNT are not defined + * with the appropriate register encodings. Their values have been + * accidentally swapped. As this is set API, the definitions here + * must be used, rather than ones derived from the encodings. + */ #define KVM_REG_ARM_TIMER_CTL ARM64_SYS_REG(3, 3, 14, 3, 1) -#define KVM_REG_ARM_TIMER_CNT ARM64_SYS_REG(3, 3, 14, 3, 2) #define KVM_REG_ARM_TIMER_CVAL ARM64_SYS_REG(3, 3, 14, 0, 2) +#define KVM_REG_ARM_TIMER_CNT ARM64_SYS_REG(3, 3, 14, 3, 2) /* KVM-as-firmware specific pseudo-registers */ #define KVM_REG_ARM_FW (0x0014 << KVM_REG_ARM_COPROC_SHIFT) |