On Wed, May 12, 2021 at 06:02:37PM +0100, Marc Zyngier wrote:
On Wed, 12 May 2021 18:00:16 +0100, Alexandru Elisei <alexandru.elisei@xxxxxxx> wrote:I made this change to get it to build: $ git diff diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index dd03d5e01a94..32564b017ba0 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -335,6 +335,7 @@ static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {} static inline void kvm_arch_vcpu_block_finish(struct kvm_vcpu *vcpu) {} static inline void kvm_arm_init_debug(void) {} +static inline void kvm_arm_vcpu_init_debug(struct kvm_vcpu *vcpu) {} static inline void kvm_arm_setup_debug(struct kvm_vcpu *vcpu) {} static inline void kvm_arm_clear_debug(struct kvm_vcpu *vcpu) {} static inline void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu) {} which matches the stub for kvm_arm_init_debug(). I can spin a patch out of it and send it for 5.4 and 4.19. Marc, what do you think?Ideally, we'd drop the patch in its current form from 5.4 and 4.19, and send an updated patch with this hunk to fix the 32bit build.
Yes please. I've dropped it from 5.4 and 4.19 and we can queue up a fixed backport for the next round of releases. -- Thanks, Sasha
