From owner-svn-src-user@freebsd.org  Wed Jan  3 23:57:42 2018
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 D3DBDEB644A
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Wed,  3 Jan 2018 23:57:42 +0000 (UTC)
 (envelope-from jeff@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 mx1.freebsd.org (Postfix) with ESMTPS id 9E89A6D068;
 Wed,  3 Jan 2018 23:57:42 +0000 (UTC)
 (envelope-from jeff@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w03Nvf0a041538;
 Wed, 3 Jan 2018 23:57:41 GMT (envelope-from jeff@FreeBSD.org)
Received: (from jeff@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w03NvfrU041537;
 Wed, 3 Jan 2018 23:57:41 GMT (envelope-from jeff@FreeBSD.org)
Message-Id: <201801032357.w03NvfrU041537@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jeff set sender to
 jeff@FreeBSD.org using -f
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Wed, 3 Jan 2018 23:57:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r327531 - user/jeff/numa/sys/kern
X-SVN-Group: user
X-SVN-Commit-Author: jeff
X-SVN-Commit-Paths: user/jeff/numa/sys/kern
X-SVN-Commit-Revision: 327531
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Jan 2018 23:57:42 -0000

Author: jeff
Date: Wed Jan  3 23:57:41 2018
New Revision: 327531
URL: https://svnweb.freebsd.org/changeset/base/327531

Log:
  Fix memguard compile.

Modified:
  user/jeff/numa/sys/kern/kern_malloc.c

Modified: user/jeff/numa/sys/kern/kern_malloc.c
==============================================================================
--- user/jeff/numa/sys/kern/kern_malloc.c	Wed Jan  3 20:20:43 2018	(r327530)
+++ user/jeff/numa/sys/kern/kern_malloc.c	Wed Jan  3 23:57:41 2018	(r327531)
@@ -492,12 +492,10 @@ malloc_dbg(caddr_t *vap, unsigned long *sizep, struct 
 	    ("malloc: called with spinlock or critical section held"));
 
 #ifdef DEBUG_MEMGUARD
-	if (memguard_cmp_mtp(mtp, size)) {
-		va = memguard_alloc(size, flags);
-		if (va != NULL) {
-			*vap = va;
+	if (memguard_cmp_mtp(mtp, *sizep)) {
+		*vap = memguard_alloc(*sizep, flags);
+		if (*vap != NULL)
 			return (EJUSTRETURN);
-		}
 		/* This is unfortunate but should not be fatal. */
 	}
 #endif