mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/arch/x86/crypto/curve25519-x86_64.c
..
..
@@ -11,6 +11,7 @@
11
11
 #include <linux/jump_label.h>
12
12
 #include <linux/kernel.h>
13
13
 #include <linux/module.h>
14
+#include <linux/scatterlist.h>
14
15
 
15
16
 #include <asm/cpufeature.h>
16
17
 #include <asm/processor.h>
..
..
@@ -1499,7 +1500,7 @@
1499
1500
 static void __exit curve25519_mod_exit(void)
1500
1501
 {
1501
1502
 	if (IS_REACHABLE(CONFIG_CRYPTO_KPP) &&
1502
-	    (boot_cpu_has(X86_FEATURE_BMI2) || boot_cpu_has(X86_FEATURE_ADX)))
1503
+	    static_branch_likely(&curve25519_use_bmi2_adx))
1503
1504
 		crypto_unregister_kpp(&curve25519_alg);
1504
1505
 }
1505
1506