From nobody Mon Jan 29 14:28:17 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 4TNrJ15sp2z58p4g; Mon, 29 Jan 2024 14:28:17 +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 4TNrJ14g2dz4Wbd; Mon, 29 Jan 2024 14:28:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706538497; 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=FF3RdVvjb+WddnAh0iK60rxyFpNGxVYNeh9HRl+Ka4M=; b=JD6FGABn+NHGZw3dp9xF2IWbt9BW8X79ZtYRUxHhjZuIStklu/3JETJWbWFf+WJ9oSpKrv 2LzJouI1zDM0uvFBilllYv4ArfEd6LciVLwFuir5A6rWI63FjMtOjpkWBZ4YV1MLDNX54k Qm4/T0ua8DGgh1upFQTzQV1l3fCBUH7lW/ogbUVBxzldR0H4HGrBL/kDcOkbD83AtHmbED r/3sTGc5HUkT/bgvzj5dInWlHRHBO/XZ+ETLcNLvHBhRnF4ulgi4NGVMynkOyxIWVKYv1Y kQtecBVuxywWqt9ATX+B4r016GWcer0YWI3RwkW9Axoai8Mi1qOsBoomS7gl3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706538497; 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=FF3RdVvjb+WddnAh0iK60rxyFpNGxVYNeh9HRl+Ka4M=; b=vVPYkoKfPZkSHjVaWzm4r8y36EXrpEV+m0ORvFPwbyUBt1h5A4ieQAnYxyhjCIvIBeEKiM 5yR0EEM2djxm/bjEhKWnyYDxWIVQhK4WzDKg1gN5ec69IkZq+x/9QcbbqQFdp7Zh8LNhTX cqdhutbl+2r4M2yAmfsF5N9Wx0fomlOBUkznpOUid3PtCTZ8VMLdLWBRxd8XK43oveyaxV QUFRwFYpzVwTh6FscHUSur0yuv244urBYFIBzEHFaeoIAtblzEy2X12XNB1ZaoCZh+eNtg klRD29JC97fdmHO9sPrE67PNT3eg4Nsj12uyY1R7JBPHGMQ9uJ9kYpKT9pZaWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706538497; a=rsa-sha256; cv=none; b=EZ9BMqvaVWekUW1StiNk6rziZLqXRMvGkuWlmLGEZDUYNLRRMS9I0611ScCsUqmgdMCkCZ VqZcHQ9KE3RGEarcwG9y7Uy+YBwWtHG9UlFkjbvKpYkLiqFVKKOFP2mScPJz89b2aO9UGm dahoBPniR1rDWcd/qQQWuz5dv9CymuNEM3w6BS98AZJTh4wVMRj3wY0reA0AGG2oGnRbce cAOyRJ9x2x1iANfc+MPdTu4EXyKSufd9jpjZHjz+2YtnN5+CE7hlUIOfhRVyvEm5tTmqEl 24xEbMYXhe+RcI551KYnQGuLEqYU8QTxXbVG+k4Klyx/wXaomD5dtIOasZ3y3g== 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 4TNrJ13mMVztw0; Mon, 29 Jan 2024 14:28:17 +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 40TESHPM086873; Mon, 29 Jan 2024 14:28:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TESHio086870; Mon, 29 Jan 2024 14:28:17 GMT (envelope-from git) Date: Mon, 29 Jan 2024 14:28:17 GMT Message-Id: <202401291428.40TESHio086870@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: 604b80f152f2 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 604b80f152f20c1efa6313f9a0a483956e867225 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=604b80f152f20c1efa6313f9a0a483956e867225 commit 604b80f152f20c1efa6313f9a0a483956e867225 Author: Mark Johnston AuthorDate: 2024-01-15 17:27:11 +0000 Commit: Mark Johnston CommitDate: 2024-01-29 14:26:22 +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_ */