smccc: kvm_guest: Fix kernel builds for 32 bit arm

shamiali2008 · oupton · commit 44ff44cadbd1 · 2025-03-06T16:41:04.000-08:00
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 &lt;shameerali.kolothum.thodi@huawei.com&gt;
Signed-off-by: Oliver Upton &lt;oliver.upton@linux.dev&gt;
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ bool kvm_arm_hyp_service_available(u32 func_id)`
`55`	`55`	`}`
`56`	`56`	`EXPORT_SYMBOL_GPL(kvm_arm_hyp_service_available);`
`57`	`57`
	`58`	`+#ifdef CONFIG_ARM64`
`58`	`59`	`void __init kvm_arm_target_impl_cpu_init(void)`
`59`	`60`	`{`
`60`	`61`	`int i;`
`@@ -115,3 +116,4 @@ void __init kvm_arm_target_impl_cpu_init(void)`
`115`	`116`	`mem_free:`
`116`	`117`	`memblock_free(target, sizeof(target) max_cpus);`
`117`	`118`	`}`
	`119`	`+#endif`