svn commit: r361427 - head/sys/contrib/zstd/lib/common

Conrad Meyer cem at FreeBSD.org
Sat May 23 23:10:04 UTC 2020


Author: cem
Date: Sat May 23 23:10:03 2020
New Revision: 361427
URL: https://svnweb.freebsd.org/changeset/base/361427

Log:
  Unbreak ARM64 kernel build after r361426
  
  X-MFC-With:	r361426

Modified:
  head/sys/contrib/zstd/lib/common/zstd_internal.h

Modified: head/sys/contrib/zstd/lib/common/zstd_internal.h
==============================================================================
--- head/sys/contrib/zstd/lib/common/zstd_internal.h	Sat May 23 21:23:46 2020	(r361426)
+++ head/sys/contrib/zstd/lib/common/zstd_internal.h	Sat May 23 23:10:03 2020	(r361427)
@@ -19,7 +19,7 @@
 /*-*************************************
 *  Dependencies
 ***************************************/
-#ifdef __aarch64__
+#if defined(__aarch64__) && !defined(_KERNEL)
 #include <arm_neon.h>
 #endif
 #include "compiler.h"
@@ -228,7 +228,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(__aarch64__) && !defined(_KERNEL)
     vst1_u8((uint8_t*)dst, vld1_u8((const uint8_t*)src));
 #else
     memcpy(dst, src, 8);
@@ -237,7 +237,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(__aarch64__) && !defined(_KERNEL)
     vst1q_u8((uint8_t*)dst, vld1q_u8((const uint8_t*)src));
 #else
     memcpy(dst, src, 16);


More information about the svn-src-head mailing list