From owner-svn-src-user@freebsd.org  Tue Jan  2 23:52:28 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 1A44EE811B8
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Tue,  2 Jan 2018 23:52:28 +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 D5EF479888;
 Tue,  2 Jan 2018 23:52:27 +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 w02NqQK3034361;
 Tue, 2 Jan 2018 23:52:26 GMT (envelope-from jeff@FreeBSD.org)
Received: (from jeff@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w02NqQgA034360;
 Tue, 2 Jan 2018 23:52:26 GMT (envelope-from jeff@FreeBSD.org)
Message-Id: <201801022352.w02NqQgA034360@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: Tue, 2 Jan 2018 23:52:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r327504 - 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: 327504
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: Tue, 02 Jan 2018 23:52:28 -0000

Author: jeff
Date: Tue Jan  2 23:52:26 2018
New Revision: 327504
URL: https://svnweb.freebsd.org/changeset/base/327504

Log:
  Fix compile with DIAGNOSTIC

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	Tue Jan  2 21:31:54 2018	(r327503)
+++ user/jeff/numa/sys/kern/kern_malloc.c	Tue Jan  2 23:52:26 2018	(r327504)
@@ -525,7 +525,7 @@ malloc(unsigned long size, struct malloc_type *mtp, in
 	struct malloc_type_internal *mtip;
 	caddr_t va;
 	uma_zone_t zone;
-#if defined(DIAGNOSTIC) || defined(DEBUG_REDZONE)
+#if defined(DEBUG_REDZONE)
 	unsigned long osize = size;
 #endif
 
@@ -575,7 +575,7 @@ malloc_domain(unsigned long size, struct malloc_type *
 	struct malloc_type_internal *mtip;
 	caddr_t va;
 	uma_zone_t zone;
-#if defined(DIAGNOSTIC) || defined(DEBUG_REDZONE)
+#if defined(DEBUG_REDZONE)
 	unsigned long osize = size;
 #endif