From nobody Wed Sep 07 07:57:51 2022 X-Original-To: dev-commits-src-branches@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 4MMvkS1y9Gz4bsSF; Wed, 7 Sep 2022 07:57:52 +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 4MMvkS0gMsz45Df; Wed, 7 Sep 2022 07:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662537472; 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=n6KCnYOdPEgX4eGKBwb5sgbfQgCEaD0LxngiUse3P/I=; b=MJf5yczt1SERMIUaHSyWW02bJWObscxv6dG2lPwSZWPoX9rBOwJyoR+d8YC8OCfQDN6jkp yz/BqJlBSTEfNvXd4jMERZXOXgGxBawBVXAUVRq33UjaHxxBgzdx+qYJTSt79YFTmyxjBq VdwcZWlAj7mxk27MEFg2c7QPJA7fqUtrG1YwPNp++mNghqcwXdTAVb/Oyi1s+bIrv6YDFg EMEElrj/siL8F4gKXGi0gZgtG3MgVVSCwxYKFAvNzM3ZTgq3M3EgEFn1Mf9f0QIiNxfTW+ z3HVIcqNHSkVv019iacvMKduJrWUZqsm1GybVdC1H4rWKSzq3jWdZMr5l97cIA== 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 4MMvkR6YdCzSPW; Wed, 7 Sep 2022 07:57:51 +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 2877vpV5081586; Wed, 7 Sep 2022 07:57:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2877vpWn081585; Wed, 7 Sep 2022 07:57:51 GMT (envelope-from git) Date: Wed, 7 Sep 2022 07:57:51 GMT Message-Id: <202209070757.2877vpWn081585@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: ef370b780a96 - stable/12 - x86: Correct a typo in source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: ef370b780a968388351f869345da6706486c96ce Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662537472; 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=n6KCnYOdPEgX4eGKBwb5sgbfQgCEaD0LxngiUse3P/I=; b=bjZaoTTg9nAYOou65RZwVF57GHBrtpXfqPcvkg9fwVeVwrPEd+GeAr9yM/sMiI2PT9aS4S sRV/xDCQ55Ya/zegws4QVzQa2Wu1mZvI7UdhOcWxS0gD7dPtoAc2NE3ko9AUg7LT+wwRI+ iMRSyztyWXTZC74CJ50TcZcSQzMM2gIp9BxMDDNw/iWq5cuR8gAv95mprUFgftPTPS0nSL Hq5ESYeE3XB3rB04G/BJzUzm3UwTkanXEEizF8VBhp8LRmrIDV+HE829b4oTj1tuSDh3yV QwgsktBLJU+jfIyUeR14tyX0iRbDa0BBJd/h32LaCM0/NipBRL5aWimLwE+tKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662537472; a=rsa-sha256; cv=none; b=en0m4KVGVfUHQPu9oLzGHuEZpJW3CfxVGOusLe7SlT1QiAqB1xAbnhd1CeLeUsVHIX9vzm 2W2nusfzLnhfDNzptc3KFcvPw8ABdwuYB+RguP2pFrR7HFuycrQMkMh32P6MkmBxzixG8r ZWrU6AeygA1SLuez89i92TjnMtAtzkj5L5OxVUl1gbAZ8AmGIxLy2RjXEAPqVCEuGAklBT Dz6CHQt8amu8CSs4A+pI5qP8eb7opcumwq7vOmY48vC9JYK3OgtdTutzrXUBlSFuZmLS0x 9JzDM8camSRyLDGN7hdcxgZ9A2IQRRp7DdIifb+BxjEZl9YUrn0OBvXYYo5vgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gbe (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=ef370b780a968388351f869345da6706486c96ce commit ef370b780a968388351f869345da6706486c96ce Author: Gordon Bergling AuthorDate: 2022-09-04 11:36:53 +0000 Commit: Gordon Bergling CommitDate: 2022-09-07 07:57:28 +0000 x86: Correct a typo in source code comment - s/occured/occurred/ (cherry picked from commit 9755e244c9b87aa0ff993aa5cf777da65fa9f627) --- sys/x86/x86/mca.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/x86/x86/mca.c b/sys/x86/x86/mca.c index 1d2cc56e117d..df3e4e94c299 100644 --- a/sys/x86/x86/mca.c +++ b/sys/x86/x86/mca.c @@ -594,7 +594,7 @@ update_threshold(enum scan_mode mode, int valid, int last_intr, int count, if (mode != POLLED) return (limit); - /* If a CMCI occured recently, do nothing for now. */ + /* If a CMCI occurred recently, do nothing for now. */ if (delta < cmc_throttle) return (limit);