summaryrefslogtreecommitdiffstats
path: root/arch/arm64
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2014-07-01 16:53:13 +0100
committerChristoffer Dall <christoffer.dall@linaro.org>2014-07-11 04:46:54 -0700
commitefd48ceacea78e4d4656aa0a6bf4c5b92ed22130 (patch)
treedde9ddcca5e2e9b785276acf4de1b0a1d5b6ea49 /arch/arm64
parentb88657674d39fc2127d62d0de9ca142e166443c8 (diff)
downloadlinux-stable-efd48ceacea78e4d4656aa0a6bf4c5b92ed22130.tar.gz
linux-stable-efd48ceacea78e4d4656aa0a6bf4c5b92ed22130.tar.bz2
linux-stable-efd48ceacea78e4d4656aa0a6bf4c5b92ed22130.zip
arm64: KVM: export demux regids as KVM_REG_ARM64
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>
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/kvm/sys_regs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index c59a1bdab5eb..34f25a590bd7 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;