diff options
| author | Marc Zyngier | 2016-01-06 13:10:58 +0100 |
|---|---|---|
| committer | Marc Zyngier | 2016-02-29 19:34:14 +0100 |
| commit | b57cd6f6407d420d522ab71b9c0dd11993e49ba1 (patch) | |
| tree | 6363d50fede2853d126691c5e1d4f6ca0b19bafd /arch/arm/include/asm/kvm_host.h | |
| parent | ARM: KVM: Add panic handling code (diff) | |
| download | kernel-qcow2-linux-b57cd6f6407d420d522ab71b9c0dd11993e49ba1.tar.gz kernel-qcow2-linux-b57cd6f6407d420d522ab71b9c0dd11993e49ba1.tar.xz kernel-qcow2-linux-b57cd6f6407d420d522ab71b9c0dd11993e49ba1.zip | |
ARM: KVM: Change kvm_call_hyp return type to unsigned long
Having u64 as the kvm_call_hyp return type is problematic, as
it forces all kind of tricks for the return values from HYP
to be promoted to 64bit (LE has the LSB in r0, and BE has them
in r1).
Since the only user of the return value is perfectly happy with
a 32bit value, let's make kvm_call_hyp return an unsigned long,
which is 32bit on ARM.
This solves yet another headache.
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm/include/asm/kvm_host.h')
| -rw-r--r-- | arch/arm/include/asm/kvm_host.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index 02932ba8a653..c62d71751f7a 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -165,7 +165,7 @@ unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu); int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *indices); int kvm_arm_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg); int kvm_arm_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg); -u64 kvm_call_hyp(void *hypfn, ...); +unsigned long kvm_call_hyp(void *hypfn, ...); void force_vm_exit(const cpumask_t *mask); #define KVM_ARCH_WANT_MMU_NOTIFIER |