From nobody Mon Jan 29 14:28:07 2024 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 4TNrHq3czJz58pP8; Mon, 29 Jan 2024 14:28:07 +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 4TNrHq38DXz4WB3; Mon, 29 Jan 2024 14:28:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706538487; 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=ZS9+2wJTZZH5uJI7yNKgSwCAQEWODD7o67ySfIRP3Rs=; b=nMrp8+vlQRRz4Fcuf7Yxj+sFM9ojDdb2ORVVK0pH72i1JMh7GrwBQH5oZDegSA+RbbWQ0H FMad2TB9QLkT0RH4HArkeAOU3QDwiiJgWv/mSPY4n1oQfXbOwBD3jjc5tLd4wQqYGP/vAZ lVjCcGUV+ekHlw9JKOgihzdGJJABNz8DLf6XPBqQ4jUzlFnOygS3xg6UdVQtUUOBQeQn9W O8iqVBJ5NgXGYVfY/3XV9wLrbIX0sQ/ww9DDugSXiqFpOkdwC0rtsL++PZWeBZy0S8evWy EpWRmkLLBQKb80PJzgzNGG0Rur47pFgDWzP26ejDqEFQPIVVkMsqgKfsuUZfRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706538487; 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=ZS9+2wJTZZH5uJI7yNKgSwCAQEWODD7o67ySfIRP3Rs=; b=xscBM2qb387BFPX7IeMVTV1+P241Inx8yjQ4oJ7LlNmnWHznJBVrj86hVmRwJctgH/yfqs 9yvDIaRuLm3uyqTvHJ/qytEzHiMGBUtkeVKuQJbDmq1flJ2fDaX3cdIa2J04av5piWhdES ICS/S0wbiXm5ooTqfDPanV+SJwA7eXcLQCp8HSGikiKP40pKVnlJiv/uqXq5w2dO20i0Oe ftkrWetbGtQRlbtt1Rf9jAZ+iovxV6s2lijVgqXJUWdpZfmcmaX2P6tpQo4XZBU8kDY9hu EmtWFklK0ZoRagvDbIJmLteeoXANDHrzY6dKnIT0nzxSDHN+ACcsT3+OnQEEwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706538487; a=rsa-sha256; cv=none; b=aIajgZ79jboCOR2vv6B6pJbIUn0J3+9NLVa4CEYoiRCcQtacLRfeH4gaZD6W4Q9+AoBacr OC8y4ASjt2JFr2eRIvrmT9cxEo1fVmqbiFrrZ1ZFjRk+mnvb6xcPTUjSDK198xo5h5pWQj ibqOYP6PCBEamQRV0R+khVL16uvBvXpXGVUvSZOY8cuGurrLHuSGq/EhMDXV1pZV0Bi7LF 2n0eOb6SJkkg2J3BFtXlIvViuV4RrBtMBBe8slxb7X/0a4HDy4ysIPAsINY1u2hTZG19dy qG5puTNPV76wMO8IQm14XZ+WH0JQI3K/ZxuWFXRzCI5dxoEFqMqfwCeHk8hT1g== 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 4TNrHq2DG3zvGs; Mon, 29 Jan 2024 14:28:07 +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 40TES7AT086660; Mon, 29 Jan 2024 14:28:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TES7bj086657; Mon, 29 Jan 2024 14:28:07 GMT (envelope-from git) Date: Mon, 29 Jan 2024 14:28:07 GMT Message-Id: <202401291428.40TES7bj086657@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 08dbe7213452 - stable/14 - condvar: Clean up condvar.h a bit 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 08dbe72134524de9c5b4a675b0bdf6773bbee8b0 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=08dbe72134524de9c5b4a675b0bdf6773bbee8b0 commit 08dbe72134524de9c5b4a675b0bdf6773bbee8b0 Author: Mark Johnston AuthorDate: 2024-01-15 17:27:11 +0000 Commit: Mark Johnston CommitDate: 2024-01-29 14:25:45 +0000 condvar: Clean up condvar.h a bit - Remove a typedef that has been unused for a long time. - Remove a LOCORE guard. MI headers like condvar.h don't need such a guard in general. - Move a forward declaration into the _KERNEL block. - Add a types.h include to make the file self-contained. Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D43449 (cherry picked from commit 61b0092be751b8241b65cc14e4167d431f1e5ad8) --- sys/sys/condvar.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/sys/sys/condvar.h b/sys/sys/condvar.h index 23558879452c..cd16c85024d4 100644 --- a/sys/sys/condvar.h +++ b/sys/sys/condvar.h @@ -29,14 +29,6 @@ #ifndef _SYS_CONDVAR_H_ #define _SYS_CONDVAR_H_ -#ifndef LOCORE -#include - -struct lock_object; -struct thread; - -TAILQ_HEAD(cv_waitq, thread); - /* * Condition variable. The waiters count is protected by the mutex that * protects the condition; that is, the mutex that is passed to cv_wait*() @@ -49,6 +41,10 @@ struct cv { }; #ifdef _KERNEL +#include + +struct lock_object; + void cv_init(struct cv *cvp, const char *desc); void cv_destroy(struct cv *cvp); @@ -85,5 +81,4 @@ void cv_broadcastpri(struct cv *cvp, int pri); #define cv_wmesg(cvp) ((cvp)->cv_description) #endif /* _KERNEL */ -#endif /* !LOCORE */ #endif /* _SYS_CONDVAR_H_ */