diff options
| author | Rich Ercolani <rincebrain@gmail.com> | 2022-03-01 08:36:32 -0500 |
|---|---|---|
| committer | Brian Behlendorf <behlendorf1@llnl.gov> | 2022-03-01 13:56:00 -0800 |
| commit | fe2ea67ddd6359253a772c68e4bebafbdd2505da (patch) | |
| tree | c0e5f2f2e5ae9a19d2c3bbc427a77147c238fdf4 | |
| parent | e2206359955de08a43373eff761af278bfd96d3f (diff) | |
Re-apply 6ba2e72b, silence lint
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
Closes #12978
| -rw-r--r-- | module/Makefile.in | 2 | ||||
| -rw-r--r-- | module/zstd/lib/common/zstd_internal.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/module/Makefile.in b/module/Makefile.in index e1ece4ff6..762f9394d 100644 --- a/module/Makefile.in +++ b/module/Makefile.in @@ -128,7 +128,7 @@ cppcheck-Linux: --include=@LINUX_OBJ@/include/generated/autoconf.h \ --include=@top_srcdir@/zfs_config.h \ --config-exclude=@LINUX_OBJ@/include \ - --config-exclude=zstd/lib \ + -i zstd/lib \ -I @LINUX_OBJ@/include \ -I @top_srcdir@/include/os/linux/kernel \ -I @top_srcdir@/include/os/linux/spl \ diff --git a/module/zstd/lib/common/zstd_internal.h b/module/zstd/lib/common/zstd_internal.h index 20899575b..4a86d186a 100644 --- a/module/zstd/lib/common/zstd_internal.h +++ b/module/zstd/lib/common/zstd_internal.h @@ -19,7 +19,7 @@ /*-************************************* * Dependencies ***************************************/ -#ifdef __aarch64__ +#if !defined(ZSTD_NO_INTRINSICS) && defined(__ARM_NEON) #include <arm_neon.h> #endif #include "compiler.h" @@ -227,7 +227,7 @@ static const U32 OF_defaultNormLog = OF_DEFAULTNORMLOG; * Shared functions to include for inlining *********************************************/ static void ZSTD_copy8(void* dst, const void* src) { -#ifdef __aarch64__ +#if !defined(ZSTD_NO_INTRINSICS) && defined(__ARM_NEON) vst1_u8((uint8_t*)dst, vld1_u8((const uint8_t*)src)); #else memcpy(dst, src, 8); @@ -236,7 +236,7 @@ static void ZSTD_copy8(void* dst, const void* src) { #define COPY8(d,s) { ZSTD_copy8(d,s); d+=8; s+=8; } static void ZSTD_copy16(void* dst, const void* src) { -#ifdef __aarch64__ +#if !defined(ZSTD_NO_INTRINSICS) && defined(__ARM_NEON) vst1q_u8((uint8_t*)dst, vld1q_u8((const uint8_t*)src)); #else memcpy(dst, src, 16); |