From: David Woodhouse <[email protected]> kvm_set_routing_entry() gained a plane_level argument, and every architecture's implementation was converted except the stub in the arm64 KVM module on s390, which arrived in the same release. An s390 build with that module then fails:
arch/s390/kvm/arm64/arm.c:745:5: error: conflicting types for 'kvm_set_routing_entry' Give the stub the new signature. It still refuses every routing entry. Fixes the s390 arm64 stub that "kvm: Pass plane_level to kvm_set_routing_entry()" did not convert. Fixes: https://lore.kernel.org/all/[email protected]/ Reported-by: kernel test robot <[email protected]> Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/ Signed-off-by: David Woodhouse <[email protected]> --- arch/s390/kvm/arm64/arm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/s390/kvm/arm64/arm.c b/arch/s390/kvm/arm64/arm.c index 64a609f087a8..0f0fab76e71a 100644 --- a/arch/s390/kvm/arm64/arm.c +++ b/arch/s390/kvm/arm64/arm.c @@ -744,7 +744,8 @@ int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e, struct kvm *kvm, int kvm_set_routing_entry(struct kvm *kvm, struct kvm_kernel_irq_routing_entry *e, - const struct kvm_irq_routing_entry *ue) + const struct kvm_irq_routing_entry *ue, + unsigned plane_level) { return -EINVAL; } -- 2.50.1
