From owner-svn-src-all@freebsd.org Sat Feb 24 14:34:24 2018 Return-Path: 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 53D27F235B2; Sat, 24 Feb 2018 14:34:24 +0000 (UTC) (envelope-from cognet@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 0697D86135; Sat, 24 Feb 2018 14:34:24 +0000 (UTC) (envelope-from cognet@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 0189B26D93; Sat, 24 Feb 2018 14:34:24 +0000 (UTC) (envelope-from cognet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1OEYNlx001177; Sat, 24 Feb 2018 14:34:23 GMT (envelope-from cognet@FreeBSD.org) Received: (from cognet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1OEYNwM001176; Sat, 24 Feb 2018 14:34:23 GMT (envelope-from cognet@FreeBSD.org) Message-Id: <201802241434.w1OEYNwM001176@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cognet set sender to cognet@FreeBSD.org using -f From: Olivier Houchard Date: Sat, 24 Feb 2018 14:34:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329908 - head/sys/arm/arm X-SVN-Group: head X-SVN-Commit-Author: cognet X-SVN-Commit-Paths: head/sys/arm/arm X-SVN-Commit-Revision: 329908 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.25 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: Sat, 24 Feb 2018 14:34:24 -0000 Author: cognet Date: Sat Feb 24 14:34:23 2018 New Revision: 329908 URL: https://svnweb.freebsd.org/changeset/base/329908 Log: Use NULL as a mtx type instead of "", as it otherwise confuses WITNESS. Modified: head/sys/arm/arm/gic.c Modified: head/sys/arm/arm/gic.c ============================================================================== --- head/sys/arm/arm/gic.c Sat Feb 24 13:04:02 2018 (r329907) +++ head/sys/arm/arm/gic.c Sat Feb 24 14:34:23 2018 (r329908) @@ -448,7 +448,7 @@ arm_gic_attach(device_t dev) gic_sc = sc; /* Initialize mutex */ - mtx_init(&sc->mutex, "GIC lock", "", MTX_SPIN); + mtx_init(&sc->mutex, "GIC lock", NULL, MTX_SPIN); /* Distributor Interface */ sc->gic_d_bst = rman_get_bustag(sc->gic_res[0]); @@ -1423,7 +1423,7 @@ arm_gicv2m_attach(device_t dev) arm_gic_reserve_msi_range(device_get_parent(dev), sc->sc_spi_start, sc->sc_spi_count); - mtx_init(&sc->sc_mutex, "GICv2m lock", "", MTX_DEF); + mtx_init(&sc->sc_mutex, "GICv2m lock", NULL, MTX_DEF); intr_msi_register(dev, sc->sc_xref);