From owner-svn-src-stable@freebsd.org Thu Oct 3 12:47:06 2019
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3F32E134C1A;
Thu, 3 Oct 2019 12:47:06 +0000 (UTC)
(envelope-from kevans@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
server-signature RSA-PSS (4096 bits)
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 46kXp20xqYz44Ds;
Thu, 3 Oct 2019 12:47:06 +0000 (UTC)
(envelope-from kevans@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 03D27C520;
Thu, 3 Oct 2019 12:47:06 +0000 (UTC)
(envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x93Cl5sL080665;
Thu, 3 Oct 2019 12:47:05 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id x93Cl5gm080664;
Thu, 3 Oct 2019 12:47:05 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <201910031247.x93Cl5gm080664@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Thu, 3 Oct 2019 12:47:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r353041 - in stable: 11/sys/dev/fdt 12/sys/dev/fdt
X-SVN-Group: stable-12
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: in stable: 11/sys/dev/fdt 12/sys/dev/fdt
X-SVN-Commit-Revision: 353041
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
<svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>,
<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Oct 2019 12:47:06 -0000
Author: kevans
Date: Thu Oct 3 12:47:05 2019
New Revision: 353041
URL: https://svnweb.freebsd.org/changeset/base/353041
Log:
MFC r352863: fdt_slicer: bump to SI_ORDER_THIRD following r347183
r347183 bumped GEOM classes to SI_ORDER_SECOND to resolve a race between
them and the initialization of devsoftc.mtx in devinit, but missed this
dependency on g_flashmap that may now lose the race against GEOM
classes/g_init.
There's a great comment that describes the situation that has also been
updated with the new ordering of GEOM classes.
Modified:
stable/12/sys/dev/fdt/fdt_slicer.c
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/sys/dev/fdt/fdt_slicer.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/12/sys/dev/fdt/fdt_slicer.c
==============================================================================
--- stable/12/sys/dev/fdt/fdt_slicer.c Thu Oct 3 12:26:55 2019 (r353040)
+++ stable/12/sys/dev/fdt/fdt_slicer.c Thu Oct 3 12:47:05 2019 (r353041)
@@ -159,12 +159,12 @@ fdt_slicer_cleanup(void)
}
/*
- * Must be initialized after GEOM classes (SI_SUB_DRIVERS/SI_ORDER_FIRST),
+ * Must be initialized after GEOM classes (SI_SUB_DRIVERS/SI_ORDER_SECOND),
* i. e. after g_init() is called, due to the use of the GEOM topology_lock
* in flash_register_slicer(). However, must be before SI_SUB_CONFIGURE.
*/
-SYSINIT(fdt_slicer, SI_SUB_DRIVERS, SI_ORDER_SECOND, fdt_slicer_init, NULL);
-SYSUNINIT(fdt_slicer, SI_SUB_DRIVERS, SI_ORDER_SECOND, fdt_slicer_cleanup, NULL);
+SYSINIT(fdt_slicer, SI_SUB_DRIVERS, SI_ORDER_THIRD, fdt_slicer_init, NULL);
+SYSUNINIT(fdt_slicer, SI_SUB_DRIVERS, SI_ORDER_THIRD, fdt_slicer_cleanup, NULL);
static int
mod_handler(module_t mod, int type, void *data)
@@ -181,5 +181,5 @@ static moduledata_t fdt_slicer_mod = {
"fdt_slicer", mod_handler, NULL
};
-DECLARE_MODULE(fdt_slicer, fdt_slicer_mod, SI_SUB_DRIVERS, SI_ORDER_SECOND);
+DECLARE_MODULE(fdt_slicer, fdt_slicer_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD);
MODULE_VERSION(fdt_slicer, 1);