diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2014-07-01 16:53:13 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-04-30 11:15:07 +0200 |
| commit | 6a6ab17612d5dd201198e88d6f7fcb476a7ae127 (patch) | |
| tree | de556623382e3087f7b9d6b9415820bfc87b047b /arch | |
| parent | 714b16417725d1adc0b8d2010c5cbb4c8df5e371 (diff) | |
| download | lwn-6a6ab17612d5dd201198e88d6f7fcb476a7ae127.tar.gz lwn-6a6ab17612d5dd201198e88d6f7fcb476a7ae127.zip | |
arm64: KVM: export demux regids as KVM_REG_ARM64
commit efd48ceacea78e4d4656aa0a6bf4c5b92ed22130 upstream.
I suspect this is a -ECUTPASTE fault from the initial implementation. If
we don't declare the register ID to be KVM_REG_ARM64 the KVM_GET_ONE_REG
implementation kvm_arm_get_reg() returns -EINVAL and hilarity ensues.
The kvm/api.txt document describes all arm64 registers as starting with
0x60xx... (i.e KVM_REG_ARM64).
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/kvm/sys_regs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 03244582bc55..5ee99e43890a 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -962,7 +962,7 @@ static unsigned int num_demux_regs(void) static int write_demux_regids(u64 __user *uindices) { - u64 val = KVM_REG_ARM | KVM_REG_SIZE_U32 | KVM_REG_ARM_DEMUX; + u64 val = KVM_REG_ARM64 | KVM_REG_SIZE_U32 | KVM_REG_ARM_DEMUX; unsigned int i; val |= KVM_REG_ARM_DEMUX_ID_CCSIDR; |