From owner-svn-src-all@freebsd.org  Thu Jun 21 11:43:55 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 78176101BA10;
 Thu, 21 Jun 2018 11:43:55 +0000 (UTC) (envelope-from br@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 1172778DC6;
 Thu, 21 Jun 2018 11:43:55 +0000 (UTC) (envelope-from br@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 E1DCE114CE;
 Thu, 21 Jun 2018 11:43:54 +0000 (UTC) (envelope-from br@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5LBhsas060901;
 Thu, 21 Jun 2018 11:43:54 GMT (envelope-from br@FreeBSD.org)
Received: (from br@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5LBhsZT060900;
 Thu, 21 Jun 2018 11:43:54 GMT (envelope-from br@FreeBSD.org)
Message-Id: <201806211143.w5LBhsZT060900@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org
 using -f
From: Ruslan Bukin <br@FreeBSD.org>
Date: Thu, 21 Jun 2018 11:43:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r335475 - head/sys/vm
X-SVN-Group: head
X-SVN-Commit-Author: br
X-SVN-Commit-Paths: head/sys/vm
X-SVN-Commit-Revision: 335475
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Jun 2018 11:43:55 -0000

Author: br
Date: Thu Jun 21 11:43:54 2018
New Revision: 335475
URL: https://svnweb.freebsd.org/changeset/base/335475

Log:
  Fix uma_zalloc_pcpu_arg() operation in case of !SMP build.
  
  Reviewed by:	mjg
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/vm/uma_core.c

Modified: head/sys/vm/uma_core.c
==============================================================================
--- head/sys/vm/uma_core.c	Thu Jun 21 11:24:20 2018	(r335474)
+++ head/sys/vm/uma_core.c	Thu Jun 21 11:43:54 2018	(r335475)
@@ -2234,13 +2234,19 @@ void *
 uma_zalloc_pcpu_arg(uma_zone_t zone, void *udata, int flags)
 {
 	void *item;
+#ifdef SMP
 	int i;
 
 	MPASS(zone->uz_flags & UMA_ZONE_PCPU);
+#endif
 	item = uma_zalloc_arg(zone, udata, flags &~ M_ZERO);
 	if (item != NULL && (flags & M_ZERO)) {
+#ifdef SMP
 		CPU_FOREACH(i)
 			bzero(zpcpu_get_cpu(item, i), zone->uz_size);
+#else
+		bzero(item, zone->uz_size);
+#endif
 	}
 	return (item);
 }