From owner-svn-src-all@freebsd.org Fri Aug 9 09:57:05 2019 Return-Path: Delivered-To: svn-src-all@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 07299C4281; Fri, 9 Aug 2019 09:57:05 +0000 (UTC) (envelope-from mmel@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 464gdD6QMtz4KbN; Fri, 9 Aug 2019 09:57:04 +0000 (UTC) (envelope-from mmel@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 BDC5DBFB7; Fri, 9 Aug 2019 09:57:04 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x799v4Se063518; Fri, 9 Aug 2019 09:57:04 GMT (envelope-from mmel@FreeBSD.org) Received: (from mmel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x799v4be063517; Fri, 9 Aug 2019 09:57:04 GMT (envelope-from mmel@FreeBSD.org) Message-Id: <201908090957.x799v4be063517@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmel set sender to mmel@FreeBSD.org using -f From: Michal Meloun Date: Fri, 9 Aug 2019 09:57:04 +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: r350817 - stable/12/sys/dev/extres/phy X-SVN-Group: stable-12 X-SVN-Commit-Author: mmel X-SVN-Commit-Paths: stable/12/sys/dev/extres/phy X-SVN-Commit-Revision: 350817 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.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Aug 2019 09:57:05 -0000 Author: mmel Date: Fri Aug 9 09:57:04 2019 New Revision: 350817 URL: https://svnweb.freebsd.org/changeset/base/350817 Log: MFC r343498: Properly define and declare phynode_topo_lock, it should be single global variable. Modified: stable/12/sys/dev/extres/phy/phy.c stable/12/sys/dev/extres/phy/phy_internal.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/extres/phy/phy.c ============================================================================== --- stable/12/sys/dev/extres/phy/phy.c Fri Aug 9 08:58:09 2019 (r350816) +++ stable/12/sys/dev/extres/phy/phy.c Fri Aug 9 09:57:04 2019 (r350817) @@ -68,7 +68,7 @@ static phynode_method_t phynode_methods[] = { DEFINE_CLASS_0(phynode, phynode_class, phynode_methods, 0); static phynode_list_t phynode_list = TAILQ_HEAD_INITIALIZER(phynode_list); - +struct sx phynode_topo_lock; SX_SYSINIT(phy_topology, &phynode_topo_lock, "Phy topology lock"); /* ---------------------------------------------------------------------------- Modified: stable/12/sys/dev/extres/phy/phy_internal.h ============================================================================== --- stable/12/sys/dev/extres/phy/phy_internal.h Fri Aug 9 08:58:09 2019 (r350816) +++ stable/12/sys/dev/extres/phy/phy_internal.h Fri Aug 9 09:57:04 2019 (r350817) @@ -78,6 +78,6 @@ struct phy { #define PHYNODE_XLOCK(_sc) sx_xlock(&((_sc)->lock)) #define PHYNODE_UNLOCK(_sc) sx_unlock(&((_sc)->lock)) -struct sx phynode_topo_lock; +extern struct sx phynode_topo_lock; #endif /* DEV_EXTRES_PHY_INTERNAL_H */