From nobody Thu Apr 13 18:04:04 2023 X-Original-To: dev-commits-src-main@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 4Py6sK2B9dz45YLt; Thu, 13 Apr 2023 18:04:05 +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 4Py6sJ5NZ5z40MT; Thu, 13 Apr 2023 18:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681409044; 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=844x3E2Uqz4vJeRtJvtaCrUjH3lA2rpp398L5aTQpro=; b=PQVWmAc2ANGUY3vyQTj0gfnWcgXIE/D8y38E/H2vW/kZ8u4YhDOCxOhGsgb6b5rZHAMlNy /olZEPblMXl5B4LWjfHixLb/xc6pmZpH0ppQ4Yg0iHztgZlbmKICA5AFS7GXAqly4pAgoS DnGhZUdBFOkMydK7n0fb0k7KEWiC5Itp+MVodiu8kVyTnJuPb6wv31gkmpS//PR+ya083g HUmhdMGqRFE4XnrzoaQYSDqp8WFdSCZ2qv6tHJ8qkNRyUkLsx3sO294Wa8/WpkrJrdORro 7ef2UvKHOvpTu1heS5Ijvqp84SkMsk/lhHMY7WG8YqzXdCFjxH9yQQn82dAZyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681409044; 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=844x3E2Uqz4vJeRtJvtaCrUjH3lA2rpp398L5aTQpro=; b=Pp7O3nYwBtuoQSh95+HO0b7cEaC7A9GSVYiow4H5681lbfsTzD+I6T2f9OAPC+XEidI5OL peEAOO0yTk1AzQKEj450xfX2WQFTObJtaCYib8LzvFJ5lXAD3ZAiq92CkYGyM5moB9RGao 5se7UfrfC59JGC/d5nXumgy4/flXK/DLl9EiPb33WcbFIqfmiqjCw9jnstQ2P0blsKtxxK BNfvE49lenReZqb8/CDtnKfEt7Tchv1qCpcaZFVEW/Q+yVEnScrEhE5xn/uvksrGBVJunR cnxFtf0oFhbtRilrj1mC6aOWHkIgtnfFwqv/6SlKSACOaURGzctTzazwIvPVog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681409044; a=rsa-sha256; cv=none; b=d7hjNmtLXOy75hU6cGOVFgJG8WNqvHxJntEiz7YXEgLUaymBKYO97/jcb0dgO9fogn7Yf6 7sFSdeWdTMwV7c8THFxLmHX13W2wJNQVVB65xkcCRQ1BGskF5QXgSeGHUJGtTD4sjZExdE wo60FD3LqrMzVbspiYRP1BM7wxQhSHSUPJ2fyeMIm8us9ywdH+JBdXHcu3qrFta7JEn8uA jQ3sWDbBMV0dfjplmG7ItEOk8zH0tE4vHS2j9HVh/ICgzf1VvkValm88kyd+pCzcupmxoR YXSoIGxJq1aEsoEfCCTEoDbfv+eDgDq6VPDrE5BkKexmlYWFjyPbrJURRlzKHw== 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 4Py6sJ4SvYzsPl; Thu, 13 Apr 2023 18:04:04 +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 33DI4460015737; Thu, 13 Apr 2023 18:04:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33DI44uZ015736; Thu, 13 Apr 2023 18:04:04 GMT (envelope-from git) Date: Thu, 13 Apr 2023 18:04:04 GMT Message-Id: <202304131804.33DI44uZ015736@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: c159f76713d7 - main - kern: remove a double word in a KASSERT in subr_trap List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: c159f76713d7c1cbfdfc0c81dd91a5483096cf6f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=c159f76713d7c1cbfdfc0c81dd91a5483096cf6f commit c159f76713d7c1cbfdfc0c81dd91a5483096cf6f Author: Gordon Bergling AuthorDate: 2023-04-13 18:03:37 +0000 Commit: Gordon Bergling CommitDate: 2023-04-13 18:03:37 +0000 kern: remove a double word in a KASSERT in subr_trap - s/with with/with/ MFC after: 5 days --- sys/kern/subr_trap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index f9976b090771..1f35b8b6ba73 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -175,7 +175,7 @@ userret(struct thread *td, struct trapframe *frame) KASSERT(0, ("userret: Returning with sleep disabled")); } KASSERT(td->td_pinned == 0 || (td->td_pflags & TDP_CALLCHAIN) != 0, - ("userret: Returning with with pinned thread")); + ("userret: Returning with pinned thread")); KASSERT(td->td_vp_reserved == NULL, ("userret: Returning with preallocated vnode")); KASSERT((td->td_flags & (TDF_SBDRY | TDF_SEINTR | TDF_SERESTART)) == 0,