]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
KVM: arm64: Fix compilation when CONFIG_ARM64_USE_LSE_ATOMICS=n
authorOliver Upton <oupton@kernel.org>
Mon, 24 Nov 2025 23:54:09 +0000 (15:54 -0800)
committerOliver Upton <oupton@kernel.org>
Mon, 1 Dec 2025 08:44:02 +0000 (00:44 -0800)
__lse_swap_desc() is compiled unconditionally, even if LSE is disabled
using the config option. Align with the spirit of the config option and
fix some build errors due to __LSE_PREAMBLE being undefined with the
application of some ifdeffery.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202511250700.kAutzJFm-lkp@intel.com/
Link: https://msgid.link/20251124235409.1731253-1-oupton@kernel.org
Signed-off-by: Oliver Upton <oupton@kernel.org>
arch/arm64/kvm/at.c

index e39f814d247fb3e2480280238cbe7cb8cd008b63..f774a02d9393b54b30f66dcb18c243a07cbec628 100644 (file)
@@ -1697,6 +1697,7 @@ int __kvm_find_s1_desc_level(struct kvm_vcpu *vcpu, u64 va, u64 ipa, int *level)
        }
 }
 
+#ifdef CONFIG_ARM64_LSE_ATOMICS
 static int __lse_swap_desc(u64 __user *ptep, u64 old, u64 new)
 {
        u64 tmp = old;
@@ -1721,6 +1722,12 @@ static int __lse_swap_desc(u64 __user *ptep, u64 old, u64 new)
 
        return ret;
 }
+#else
+static int __lse_swap_desc(u64 __user *ptep, u64 old, u64 new)
+{
+       return -EINVAL;
+}
+#endif
 
 static int __llsc_swap_desc(u64 __user *ptep, u64 old, u64 new)
 {