From owner-svn-src-head@freebsd.org  Sat Jan 13 18:56:43 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EF6E9E797CB;
 Sat, 13 Jan 2018 18:56:43 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id CBA2472512;
 Sat, 13 Jan 2018 18:56:43 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0554E16DF3;
 Sat, 13 Jan 2018 18:56:43 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0DIugE6093126;
 Sat, 13 Jan 2018 18:56:42 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0DIugDH093125;
 Sat, 13 Jan 2018 18:56:42 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201801131856.w0DIugDH093125@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Sat, 13 Jan 2018 18:56:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r327937 - head/sys/contrib/zstd/lib/freebsd
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: head/sys/contrib/zstd/lib/freebsd
X-SVN-Commit-Revision: 327937
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jan 2018 18:56:44 -0000

Author: pfg
Date: Sat Jan 13 18:56:42 2018
New Revision: 327937
URL: https://svnweb.freebsd.org/changeset/base/327937

Log:
  Revert r327934 to fix the log message.

Modified:
  head/sys/contrib/zstd/lib/freebsd/zstd_kfreebsd.h

Modified: head/sys/contrib/zstd/lib/freebsd/zstd_kfreebsd.h
==============================================================================
--- head/sys/contrib/zstd/lib/freebsd/zstd_kfreebsd.h	Sat Jan 13 18:46:31 2018	(r327936)
+++ head/sys/contrib/zstd/lib/freebsd/zstd_kfreebsd.h	Sat Jan 13 18:56:42 2018	(r327937)
@@ -46,7 +46,7 @@ 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)	(mallocarray)((a), (b), M_ZSTD, M_WAITOK | M_ZERO)
+#define calloc(a,b)	(malloc)((a)*(b), M_ZSTD, M_WAITOK | M_ZERO)
 #endif
 
 #ifdef __cplusplus