diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-11-27 19:48:12 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-11-27 19:48:12 +0000 |
| commit | bb528f4f57d096793c133f44e1ac70db602d8c28 (patch) | |
| tree | ef8cda4283b6c5fe8caf2e5e4e3339b3aaceefab /arch/arm64/kvm | |
| parent | dc2286f397e69989c803abfdb0d75ae90b88c98c (diff) | |
| parent | c6232bd40b2eda3819d108e6e3f621ec604e15d8 (diff) | |
| download | linux-bb528f4f57d096793c133f44e1ac70db602d8c28.tar.bz2 | |
Merge branch 'kvm-arm64/cache-demux' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kvm')
| -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 3ce447996c61..eb276326dc42 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -87,7 +87,7 @@ void vcpu_write_sys_reg(struct kvm_vcpu *vcpu, u64 val, int reg) static u32 cache_levels; /* CSSELR values; used to index KVM_REG_ARM_DEMUX_ID_CCSIDR */ -#define CSSELR_MAX 12 +#define CSSELR_MAX 14 /* Which cache CCSIDR represents depends on CSSELR value. */ static u32 get_ccsidr(u32 csselr) |