From owner-svn-src-all@freebsd.org  Fri Jun 22 00:47:19 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 038511006FAE;
 Fri, 22 Jun 2018 00:47:19 +0000 (UTC)
 (envelope-from mmacy@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 A665476642;
 Fri, 22 Jun 2018 00:47:18 +0000 (UTC)
 (envelope-from mmacy@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 877A2197BA;
 Fri, 22 Jun 2018 00:47:18 +0000 (UTC)
 (envelope-from mmacy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5M0lI7V065555;
 Fri, 22 Jun 2018 00:47:18 GMT (envelope-from mmacy@FreeBSD.org)
Received: (from mmacy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5M0lIeC065554;
 Fri, 22 Jun 2018 00:47:18 GMT (envelope-from mmacy@FreeBSD.org)
Message-Id: <201806220047.w5M0lIeC065554@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mmacy set sender to
 mmacy@FreeBSD.org using -f
From: Matt Macy <mmacy@FreeBSD.org>
Date: Fri, 22 Jun 2018 00:47:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r335524 - head/sys/kern
X-SVN-Group: head
X-SVN-Commit-Author: mmacy
X-SVN-Commit-Paths: head/sys/kern
X-SVN-Commit-Revision: 335524
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: Fri, 22 Jun 2018 00:47:19 -0000

Author: mmacy
Date: Fri Jun 22 00:47:18 2018
New Revision: 335524
URL: https://svnweb.freebsd.org/changeset/base/335524

Log:
  epoch(9): make non-preemptible variant work early boot

Modified:
  head/sys/kern/subr_epoch.c

Modified: head/sys/kern/subr_epoch.c
==============================================================================
--- head/sys/kern/subr_epoch.c	Fri Jun 22 00:41:36 2018	(r335523)
+++ head/sys/kern/subr_epoch.c	Fri Jun 22 00:47:18 2018	(r335524)
@@ -307,6 +307,7 @@ epoch_enter(epoch_t epoch)
 	struct thread *td;
 
 	MPASS(cold || epoch != NULL);
+	INIT_CHECK(epoch);
 	td = curthread;
 
 	critical_enter();
@@ -344,6 +345,7 @@ epoch_exit(epoch_t epoch)
 	ck_epoch_record_t *record;
 	struct thread *td;
 
+	INIT_CHECK(epoch);
 	td = curthread;
 	td->td_epochnest--;
 	record = &epoch->e_pcpu[curcpu]->eps_record.er_record;