From nobody Tue Apr 18 04:11:00 2023 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 4Q0r7m4YXtz45ftt; Tue, 18 Apr 2023 04:11:00 +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 4Q0r7m2kGhz4JZf; Tue, 18 Apr 2023 04:11:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681791060; 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=03hvhAt657TZB+kcDWpuap+anoYwM2r7tx4mgm/81/k=; b=cD76kgEbLZZI5zUVcr6jQVRoUPA+SlyCC523iF4FCqBcwbx36RP5058plzUegij25kMOBU vj3+56OWSxm1YLP57L1H4tWseeQ/PGsqvMbOPxDSB/uNM1wcV7UUv4C5QEUig7uOiOASWo Qj23HaWnP6KnqIlQreO3DLcd3wSYVDbgYpeFW64gILZFkDc7aeOHB8BP5+zbE2o7XCWirw 1zosVha/6CE9tDJcRGQuXe8p/W44MlRmJI8XP2ocf0YchtXtlDCc35GF/QG7RTxThZvFbd FZBe3E06vNgXmT9HjJOPWSN3aU+nxZH+rK3JCC5cfb5o+OMEzOFOAHPIRxY+Xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681791060; 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=03hvhAt657TZB+kcDWpuap+anoYwM2r7tx4mgm/81/k=; b=iqK7nyq07sdhmmQ2LJW944M06wi/n+U7Wb0COxQXazsoDcISUZ+7ximE34flzt//fMIdnm XMtibeGFzFosSHOdwXWoIGg8qCA/gLopr9znd0pTDpYLUYjyIE1nTRLaXpMeyZpo/wfJjL 3MemJpq08regD0uWm49HHsj3q/0TL3Lk3EhJf3bndD4VpwZpdOn827DW34jnHcXs0G176R xIax+XhDXbebhtPVrpJL3e+mp+QZxIPbysMuWsV+qMZhyfw+Qb2cxcITxdQH/BCDTUHDhd GmOdpUEUqUaWxB8OxT15iKqP2cYwmnrFAQI72qcVQxKq0U1RQh2/clUj10q1cA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681791060; a=rsa-sha256; cv=none; b=I2cXyYqa+FXFNY32q2MnreFMMbDvV9QdCMZeBWM/AEwb2Zq+yuzEiA+elgk1bXYHfKEqal 7RbZadeBH5fei7tGXqzT8onYbKy2jjS6fzRzJ+J0ZPNPIUDSnOH95qA56rH1eQ1/gCarM9 lFr0oH+F+YptUdlOYmbL91KCbcW/BKZTLUCiRqcF12D6LzYt+YEFvOakw6m3PSNTaaDwk1 0d23BmGmCdlH1Zo8X6z17ZOiimUH6kOMtWFZkiCowgNy7ap2bJwJs6nQ3TNhl71BHBjDnf 9s4Dlz/n0dXwNm1Z2h5ISlqNN/W1G6BoRbaOg6GAVU55rbsL+ZQjjAWl+CJupA== 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 4Q0r7m1L8mzwf3; Tue, 18 Apr 2023 04:11:00 +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 33I4B0Ma003382; Tue, 18 Apr 2023 04:11:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33I4B0mI003381; Tue, 18 Apr 2023 04:11:00 GMT (envelope-from git) Date: Tue, 18 Apr 2023 04:11:00 GMT Message-Id: <202304180411.33I4B0mI003381@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: a545623b612e - stable/13 - kern: remove a double word in a KASSERT in subr_trap 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/13 X-Git-Reftype: branch X-Git-Commit: a545623b612ed635420eb69060e2530913f7aa04 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a545623b612ed635420eb69060e2530913f7aa04 commit a545623b612ed635420eb69060e2530913f7aa04 Author: Gordon Bergling AuthorDate: 2023-04-13 18:03:37 +0000 Commit: Gordon Bergling CommitDate: 2023-04-18 04:10:34 +0000 kern: remove a double word in a KASSERT in subr_trap - s/with with/with/ (cherry picked from commit c159f76713d7c1cbfdfc0c81dd91a5483096cf6f) --- 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 be5041fe516f..61db62ae2b08 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -188,7 +188,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,