diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2016-01-21 17:04:52 +0000 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2016-02-29 18:34:22 +0000 |
| commit | f1d67d4ac79aef6de709d7a21b35851685a1d3ee (patch) | |
| tree | 4867b98e641361b744b9ca9a94f4efa2c035cba9 /arch/arm/kvm | |
| parent | b613f59dd2628937860f37dbfbe315d9edcb1668 (diff) | |
ARM: KVM: Rename struct coproc_reg::is_64 to is_64bit
As we're going to play some tricks on the struct coproc_reg,
make sure its 64bit indicator field matches that of coproc_params.
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm/kvm')
| -rw-r--r-- | arch/arm/kvm/coproc.c | 4 | ||||
| -rw-r--r-- | arch/arm/kvm/coproc.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c index 40d6db1ca4a8..bb0690271dd2 100644 --- a/arch/arm/kvm/coproc.c +++ b/arch/arm/kvm/coproc.c @@ -423,7 +423,7 @@ static const struct coproc_reg *find_reg(const struct coproc_params *params, for (i = 0; i < num; i++) { const struct coproc_reg *r = &table[i]; - if (params->is_64bit != r->is_64) + if (params->is_64bit != r->is_64bit) continue; if (params->CRn != r->CRn) continue; @@ -1105,7 +1105,7 @@ static int write_demux_regids(u64 __user *uindices) static u64 cp15_to_index(const struct coproc_reg *reg) { u64 val = KVM_REG_ARM | (15 << KVM_REG_ARM_COPROC_SHIFT); - if (reg->is_64) { + if (reg->is_64bit) { val |= KVM_REG_SIZE_U64; val |= (reg->Op1 << KVM_REG_ARM_OPC1_SHIFT); /* diff --git a/arch/arm/kvm/coproc.h b/arch/arm/kvm/coproc.h index 27351323871d..eef1759c2b65 100644 --- a/arch/arm/kvm/coproc.h +++ b/arch/arm/kvm/coproc.h @@ -37,7 +37,7 @@ struct coproc_reg { unsigned long Op1; unsigned long Op2; - bool is_64; + bool is_64bit; /* Trapped access from guest, if non-NULL. */ bool (*access)(struct kvm_vcpu *, @@ -141,7 +141,7 @@ static inline int cmp_reg(const struct coproc_reg *i1, return i1->Op1 - i2->Op1; if (i1->Op2 != i2->Op2) return i1->Op2 - i2->Op2; - return i2->is_64 - i1->is_64; + return i2->is_64bit - i1->is_64bit; } @@ -150,8 +150,8 @@ static inline int cmp_reg(const struct coproc_reg *i1, #define CRm64(_x) .CRn = _x, .CRm = 0 #define Op1(_x) .Op1 = _x #define Op2(_x) .Op2 = _x -#define is64 .is_64 = true -#define is32 .is_64 = false +#define is64 .is_64bit = true +#define is32 .is_64bit = false bool access_vm_reg(struct kvm_vcpu *vcpu, const struct coproc_params *p, |