From: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Date: Fri, 7 Mar 2025 00:38:28 +0000 (-0800)
Subject: smccc: kvm_guest: Fix kernel builds for 32 bit arm
X-Git-Tag: v6.15-rc1~195^2~2^2~4^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44ff44cadbd144ee1159f5687a852c49c4290262;p=thirdparty%2Fkernel%2Flinux.git

smccc: kvm_guest: Fix kernel builds for 32 bit arm

The paravirtual implementation ID stuffs is 64-bit only and broke 32bit
arm builds. Slap an ifdef bandaid on the situation to get things rolling
again.

Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
---

diff --git a/drivers/firmware/smccc/kvm_guest.c b/drivers/firmware/smccc/kvm_guest.c
index 2f03b582c298a..5767aed25cdc0 100644
--- a/drivers/firmware/smccc/kvm_guest.c
+++ b/drivers/firmware/smccc/kvm_guest.c
@@ -55,6 +55,7 @@ bool kvm_arm_hyp_service_available(u32 func_id)
 }
 EXPORT_SYMBOL_GPL(kvm_arm_hyp_service_available);
 
+#ifdef CONFIG_ARM64
 void  __init kvm_arm_target_impl_cpu_init(void)
 {
 	int i;
@@ -115,3 +116,4 @@ void  __init kvm_arm_target_impl_cpu_init(void)
 mem_free:
 	memblock_free(target, sizeof(*target) * max_cpus);
 }
+#endif