From nobody Mon Aug 28 02:45:29 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 4RYw0B29Frz4rwqp; Mon, 28 Aug 2023 02:45:30 +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 4RYw0B1V0Rz4FcS; Mon, 28 Aug 2023 02:45:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693190730; 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=GdpGoHCLTH5/D+7c/Jj2Ys4mybDjKVMZBn6RpeTDIfU=; b=lyuach/gbQVpMNP+RS+ksOfYHpJzGgc37FNNV7+0X0iokpG5nJPkzJHsNlgu0gN5z7b/4S bjfDueijgsQq8VSIIuMObvh3OU95X5cFakUp6FxH2V98Amntc44oWZUJAcrAXz0I68/Bi4 A3HJzGwz5/NxakiSeah4IJK3wzzSlFWJZQ+6eMaBm54k1AwE2jB1GFnG3h1xvY0E3fIrgI BqdQ+K1OYUeg4iRMmruDD2Px9HS79pNeLWzFdJt7FggpyadmiRPLZcfFTJTZK8Pp4mdKK7 J0+2qqFh9DWX07rYAml6Rb6n1gxiMMSkfGtGmNTsrr3m+2+vzZJxKs7jxy4rWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693190730; 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=GdpGoHCLTH5/D+7c/Jj2Ys4mybDjKVMZBn6RpeTDIfU=; b=E/9MSxWrP4zIsDbsJo5jXo4oneWk0SKcr/zgweQCHZ1yFoITe7A0pf9vakicdBaIdkaBDW rTEqZS9NKKNWrsTSGdcvTuAF+u9Snj8i/J9Xob1qfoUUT0yE6GbCfwjrOXn7o733LP85i4 8ociz55PdMrSJJm61d3ny68ZjQlxQRkIPlVXO8Z5mj+jlYqmxXcm8GxUE4MoGZoPCPKgMj mN7cUmJu40ROKKDDAN+0vzWMZ0fUbjAZGsW6XLZMtDwF9t2HmdjbpMUM7z/66q7myAesAr rt9ZSU658QzW2Aa1S4SvOubK0YDAcCgcLzHbtlSMMnJs3UWf+AfLED0gygLCpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693190730; a=rsa-sha256; cv=none; b=chUC0yXHxT1H/qipsmxkp0EhpX+B+L4I0VNiyP4vElflYj2O3aGYf5Hvaz8xPP08vrVUdH zAmAfQIqgupBLYcJ1me8Ylp62slO6KyJP6ZfVJ2tXxByPs2LJ3qm+ulexkp7o+sKe+3DlK zByOriVj/brVoEOlQvWbV9dJXT1TLLWSgmICZcXbtTOVISI2f0LeuxWOQcIJma08M3AJW0 OQ5wPoJHp/To+RYzrcwCKS/S9LkWHsKaHE7K+UuMpExJfRgRXFGH0cB+z9DQ7W3Yoz8Ovp WMLDf1LV2liDife3FtJ6iGT0b4bww5h7Rzov5qzbPc1K39+s4q5NvIPWcAoMWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RYw0B0YRMzrZq; Mon, 28 Aug 2023 02:45:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37S2jTMv001139; Mon, 28 Aug 2023 02:45:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37S2jTCa001136; Mon, 28 Aug 2023 02:45:29 GMT (envelope-from git) Date: Mon, 28 Aug 2023 02:45:29 GMT Message-Id: <202308280245.37S2jTCa001136@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 876ef0c56853 - stable/13 - Fix mis-merge 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 876ef0c568535f3e4aac0a8ce911e7e24202182b Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=876ef0c568535f3e4aac0a8ce911e7e24202182b commit 876ef0c568535f3e4aac0a8ce911e7e24202182b Author: Konstantin Belousov AuthorDate: 2023-08-28 02:44:29 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-28 02:44:50 +0000 Fix mis-merge --- sys/dev/hwpmc/hwpmc_mod.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c index c402c764d0a9..0ef8fe949bca 100644 --- a/sys/dev/hwpmc/hwpmc_mod.c +++ b/sys/dev/hwpmc/hwpmc_mod.c @@ -5216,7 +5216,7 @@ pmc_process_exit(void *arg __unused, struct proc *p) } else critical_exit(); /* pp == NULL */ - +out: /* * If the process owned PMCs, free them up and free up * memory.