From nobody Mon Oct 23 17:31: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 4SDj0B37tJz4yJ10; Mon, 23 Oct 2023 17:31: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 4SDj0B2f9gz4cTY; Mon, 23 Oct 2023 17:31:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698082266; 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=N4JkqavjLaJbeFDEdlTCLImJrcQcuTZ0PKLe0NwLm8A=; b=Y6uYHMdCLEJMn9ljbofwGgHMu0hWdYmMXv9dl1aufSUME1N5sgrdg6lf5Dpb80Jk3sjNNp PrDv1hATx6swjf+uddiGFkwyCQCEjalgpWmVwWaGGFFqQ5PRvDzYUaNqulUaDNzhxDYGdM fnQ0CgOETZ4d56S0cy46EaYH+OAgCzEIDZTxAck4+Vi7yVOXOY/QqjFvmGlLWtrX5Hlk0x EFQ9fJInB7wlJZuLlsvdR5zBl3zRiAoR79dj9I+2x0e7bgakRY1zintIHhWki9GULlLEJl q+w/SwKksLozYzXop7UVRiP0emfS4PDMpMzXgBEdvFm/fas5AmOpFfOlqvEWLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698082266; a=rsa-sha256; cv=none; b=C4EliKdkrajm9ezbt9oPnN/BhuYmEzuRsb2ZDkWVZjtI5eBqozn0cijFIoZtrBzKlfDNTy N6gcnuYQn3CUORiODpWFmv9Nelp+0OeC9lF51mzrF8fRy7hgZMvMGhzELEYG4exDAwqD/f gzo2l0TpBA6y8SxCQGijwTB5lMZnxjbM26UKUENxXjSJ9tbADh9MGDfhgmy7rsWaNRqj0K /x9Wu/p5BMUAEvoNrZWzZXbceZbsHVJu5QQPceHstLMbooqITyFUKbf6zAGuPrOWjn//K2 6opBVOH/q7tPs6Af5lIQFJALU7T+OM77FYVgH52rIppZMtvi/A539Ce+N7mbwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698082266; 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=N4JkqavjLaJbeFDEdlTCLImJrcQcuTZ0PKLe0NwLm8A=; b=SYByCxoe4NdUvWULjGRs+mr9Lx9n/9U57cc9F6PDyjstgLJO2xjHOExzAaE56i2cOuMdSt DVUoDDhGrX7YN5V9DVk8zcyDbctMqCGtY32p6LK0VN3tfacPL9c+3pFc0IVEY/Xym33vYa JhxB0r/r0H0DXK8K2uPTQcp8cfxXNt/nvFl/hH24vIBd0pjN1TYaZ6QU5jZPu0psRShBbq 7m9Pdal0aL4+9hf9toa/V1MSbssUYARBh85x9xonDdovTGKfCQqC5SP2TrZG4I9NeNN+A3 SNKRefCTKTn9JO11fM8k/M5PQ1oD4iG8L1HQI3gZ3+zMHbiDEClXqVWosk8afw== 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 4SDj0B1jwHzphp; Mon, 23 Oct 2023 17:31:06 +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 39NHV6nL074623; Mon, 23 Oct 2023 17:31:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NHV6t5074621; Mon, 23 Oct 2023 17:31:06 GMT (envelope-from git) Date: Mon, 23 Oct 2023 17:31:06 GMT Message-Id: <202310231731.39NHV6t5074621@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 8bd794531118 - main - sx: fixup copy pasto in previous 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8bd794531118c17b530eb51384439c46e72bb69d Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=8bd794531118c17b530eb51384439c46e72bb69d commit 8bd794531118c17b530eb51384439c46e72bb69d Author: Mateusz Guzik AuthorDate: 2023-10-23 17:29:55 +0000 Commit: Mateusz Guzik CommitDate: 2023-10-23 17:29:55 +0000 sx: fixup copy pasto in previous Spotted by: glebius Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/kern/kern_sx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_sx.c b/sys/kern/kern_sx.c index 455ae165e328..ff3cd8a3c195 100644 --- a/sys/kern/kern_sx.c +++ b/sys/kern/kern_sx.c @@ -864,7 +864,7 @@ retry_sleepq: sleepq_wait(&sx->lock_object, 0); else error = sleepq_wait_sig(&sx->lock_object, 0); - THREAD_CONTENTION_DONE(&sx->lock_object); + THREAD_CONTENDS_ON_LOCK(&sx->lock_object); #ifdef KDTRACE_HOOKS sleep_time += lockstat_nsecs(&sx->lock_object); sleep_cnt++;