Index: head/sys/contrib/zstd/lib/freebsd/zstd_kfreebsd.h
===================================================================
--- head/sys/contrib/zstd/lib/freebsd/zstd_kfreebsd.h	(revision 327939)
+++ head/sys/contrib/zstd/lib/freebsd/zstd_kfreebsd.h	(revision 327940)
@@ -1,56 +1,56 @@
 /*-
  * Copyright (c) 2014-2015 Allan Jude <allanjude@freebsd.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * $FreeBSD$
  */
 
 #ifndef ZSTD_KFREEBSD_H
 #define ZSTD_KFREEBSD_H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #ifdef _KERNEL
 #include <sys/param.h>	/* size_t */
 #include <sys/systm.h>	/* memcpy, memset */
 #ifndef BUILDING_ZFS
 #include <sys/stddef.h>	/* ptrdiff_t */
 #endif
 #include <sys/malloc.h>
 
 MALLOC_DECLARE(M_ZSTD);
 
 #define malloc(x)	(malloc)((x), M_ZSTD, M_WAITOK)
 #define free(x)		(free)((x), M_ZSTD)
 /* in zstd's use of calloc, a is always 1 */
-#define calloc(a,b)	(malloc)((a)*(b), M_ZSTD, M_WAITOK | M_ZERO)
+#define calloc(a,b)	(mallocarray)((a), (b), M_ZSTD, M_WAITOK | M_ZERO)
 #endif
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif /* ZSTD_KFREEBSD_H */