Created
June 27, 2023 23:04
-
-
Save kaazoo/03cd515f64de71094a99b43abd21c6dc to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
$ git diff| cat | |
diff --git a/module/icp/algs/sha2/sha256_impl.c b/module/icp/algs/sha2/sha256_impl.c | |
index 01ce5cbd8..f59df7f1a 100644 | |
--- a/module/icp/algs/sha2/sha256_impl.c | |
+++ b/module/icp/algs/sha2/sha256_impl.c | |
@@ -129,12 +129,12 @@ static boolean_t sha256_have_armv8ce(void) | |
return (kfpu_allowed() && zfs_sha256_available()); | |
} | |
-extern void zfs_sha256_block_armv7(uint32_t s[8], const void *, size_t); | |
-const sha256_ops_t sha256_armv7_impl = { | |
- .is_supported = sha2_is_supported, | |
- .transform = zfs_sha256_block_armv7, | |
- .name = "armv7" | |
-}; | |
+// extern void zfs_sha256_block_armv7(uint32_t s[8], const void *, size_t); | |
+// const sha256_ops_t sha256_armv7_impl = { | |
+// .is_supported = sha2_is_supported, | |
+// .transform = zfs_sha256_block_armv7, | |
+// .name = "armv7" | |
+// }; | |
TF(zfs_sha256_block_neon, tf_sha256_neon); | |
const sha256_ops_t sha256_neon_impl = { | |
@@ -193,7 +193,7 @@ static const sha256_ops_t *const sha256_impls[] = { | |
&sha256_shani_impl, | |
#endif | |
#if defined(__aarch64__) || (defined(__arm__) && __ARM_ARCH > 6) | |
- &sha256_armv7_impl, | |
+ // &sha256_armv7_impl, | |
&sha256_neon_impl, | |
&sha256_armv8_impl, | |
#endif | |
diff --git a/module/icp/algs/sha2/sha512_impl.c b/module/icp/algs/sha2/sha512_impl.c | |
index 27b35a639..cf11a446e 100644 | |
--- a/module/icp/algs/sha2/sha512_impl.c | |
+++ b/module/icp/algs/sha2/sha512_impl.c | |
@@ -89,12 +89,12 @@ const sha512_ops_t sha512_avx2_impl = { | |
#endif | |
#elif defined(__aarch64__) | |
-extern void zfs_sha512_block_armv7(uint64_t s[8], const void *, size_t); | |
-const sha512_ops_t sha512_armv7_impl = { | |
- .is_supported = sha2_is_supported, | |
- .transform = zfs_sha512_block_armv7, | |
- .name = "armv7" | |
-}; | |
+// extern void zfs_sha512_block_armv7(uint64_t s[8], const void *, size_t); | |
+// const sha512_ops_t sha512_armv7_impl = { | |
+// .is_supported = sha2_is_supported, | |
+// .transform = zfs_sha512_block_armv7, | |
+// .name = "armv7" | |
+// }; | |
static boolean_t sha512_have_armv8ce(void) | |
{ | |
@@ -109,12 +109,12 @@ const sha512_ops_t sha512_armv8_impl = { | |
}; | |
#elif defined(__arm__) && __ARM_ARCH > 6 | |
-extern void zfs_sha512_block_armv7(uint64_t s[8], const void *, size_t); | |
-const sha512_ops_t sha512_armv7_impl = { | |
- .is_supported = sha2_is_supported, | |
- .transform = zfs_sha512_block_armv7, | |
- .name = "armv7" | |
-}; | |
+// extern void zfs_sha512_block_armv7(uint64_t s[8], const void *, size_t); | |
+// const sha512_ops_t sha512_armv7_impl = { | |
+// .is_supported = sha2_is_supported, | |
+// .transform = zfs_sha512_block_armv7, | |
+// .name = "armv7" | |
+// }; | |
static boolean_t sha512_have_neon(void) | |
{ | |
@@ -165,11 +165,11 @@ static const sha512_ops_t *const sha512_impls[] = { | |
&sha512_avx2_impl, | |
#endif | |
#if defined(__aarch64__) | |
- &sha512_armv7_impl, | |
+ // &sha512_armv7_impl, | |
&sha512_armv8_impl, | |
#endif | |
#if defined(__arm__) && __ARM_ARCH > 6 | |
- &sha512_armv7_impl, | |
+ // &sha512_armv7_impl, | |
&sha512_neon_impl, | |
#endif | |
#if defined(__PPC64__) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment