From nobody Mon May 22 10:55:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QPvVL6yk0z4TN0c; Mon, 22 May 2023 10:55:06 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QPvVL6RTyz4Nff; Mon, 22 May 2023 10:55:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684752906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NmHiVYlbKh9kE2xYtiRcw6sz08xQ1vJSwmqR7KURzgI=; b=f2+F+HLnW/6BGKcPvpCOnule8KOPYyn6jJHs6phJrItkIehU2Qi35bsLZvGMJFAcsnl+j+ BYPCr35n2E8sOf+m2Zwvll2EgjeSRLSMpnWaxmJRmIKFH6vWL+1uPzoj+sE1cFHV2Y3puw arGYfRb2T7ALSGGvANAjc4clfKTuFPjnjDXR3QStb1+dCbkAg61s1ByurDzrE03MODXt5O T0+5ttWIfSulXuGrjgwvfrrf3Yyf4p79fFBNBhd2fiZFnqHiWBMy/LcHtFHH6bKRAUg1XT 21+ML+PJEOv1LyaLLr1gLKVO+sPYfn+G0Hdr3tbp0eGDaWPJk5T6JSPM7+eXVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684752906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NmHiVYlbKh9kE2xYtiRcw6sz08xQ1vJSwmqR7KURzgI=; b=oduWeUvj2RXkd23DY870eRII9yBwF2T4ASQCpJXcqaWj1dDiQr9BbWBLYsQ3GCiP6+BSrW YLxep6Pf75qaAjCcRsTDJ62sAvfAh2uCL526gA3m5qTpvxrQH459zk4SUeO2b3onDPOFk9 LkEMsHkwBPCMOFNFLR+cFQRx6z9PL5zQ7HOCQqj6hBLPP1C1DnsMqHZs1bj7B9RJUeXx/H SCb/8NFaPUQJMSKEheZvbR2DqBjrJrgScwM+TrZLfTyF/IBeqF2hA8vG3Xy4huGsVg+Qlw 02V2sY4av5wkJvfHjmJAzdbz+omgwUwtQ7i4kPPvZ3VsSKRzXUESmzs1h/cQUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684752906; a=rsa-sha256; cv=none; b=ojmsQ4nC8M1B0i0CxGsP5xsIsQGC4eS2FPASLYBpl/Za5IKE/kEXee+486rTArXjScAHVV e013HOFN0JsJgomy1EVCB+VnwVc+WBCf8LhjPLk9c8ZPHBwNNvVqHWQsUiHyMYHKge9VMw NR6yBP62ibZBUUZsQVCTlOVkaTXbUG6W/9nXBQhgsowvMLXw2n4/qUK769EEd/Fv13zWzs 2JkQVZUaei3a3W374bYxzfY9cfVkSw6QPukD/8E9CnndKHM9YffDGSCA/XKViO+wWL2pam uqrWqt4BjDiZEHXIbgXTCVve52jcp+FBrKB2YUpwRFbp3fjV39EFdyCRKWcIRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QPvVL5NkrzFrn; Mon, 22 May 2023 10:55:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34MAt6ka096977; Mon, 22 May 2023 10:55:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34MAt6v2096976; Mon, 22 May 2023 10:55:06 GMT (envelope-from git) Date: Mon, 22 May 2023 10:55:06 GMT Message-Id: <202305221055.34MAt6v2096976@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hans Petter Selasky Subject: git: 47c887be4af7 - main - Revert "mlx4: Move DEFINE_MUTEX() outside function body." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47c887be4af7553a3fae05009516a904dfa2617e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=47c887be4af7553a3fae05009516a904dfa2617e commit 47c887be4af7553a3fae05009516a904dfa2617e Author: Hans Petter Selasky AuthorDate: 2023-05-22 10:52:10 +0000 Commit: Hans Petter Selasky CommitDate: 2023-05-22 10:53:38 +0000 Revert "mlx4: Move DEFINE_MUTEX() outside function body." Requested by: jrtc27@ This reverts commit 805d759338a2be939fffc8bf3f25cfaab981a9be. --- sys/dev/mlx4/mlx4_core/mlx4_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/mlx4/mlx4_core/mlx4_main.c b/sys/dev/mlx4/mlx4_core/mlx4_main.c index a37b900a2ed0..ca63d1d12ba6 100644 --- a/sys/dev/mlx4/mlx4_core/mlx4_main.c +++ b/sys/dev/mlx4/mlx4_core/mlx4_main.c @@ -1164,8 +1164,6 @@ err_sup: return err; } -static DEFINE_MUTEX(set_port_type_mutex); - static ssize_t set_port_type(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) @@ -1174,6 +1172,7 @@ static ssize_t set_port_type(struct device *dev, port_attr); struct mlx4_dev *mdev = info->dev; enum mlx4_port_type port_type; + static DEFINE_MUTEX(set_port_type_mutex); int err; mutex_lock(&set_port_type_mutex);