From nobody Mon Jan 15 18:07:58 2024 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 4TDKqy2smwz57F6d; Mon, 15 Jan 2024 18:07:58 +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 4TDKqy2J9Nz4K39; Mon, 15 Jan 2024 18:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705342078; 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=RaMEbE7ZoJfQhPOiiBxw2febOoKutI7ifisSAoINnwI=; b=rhmjMQGyH4anmoG+qoy/HTFFoJGvC72n9Y12vvXrMNDxF7hDjwkaYaBxT/wiy8JgZmqGW7 +8B/3C/lrRc8sBAoYKh5H9ZwYTaZeHGeX9nTKZxPzQBA2JVvo/HjPphRg0pnNNpfwiNfZO /5avoTdUtVkrcVLErjplqlRBYMpKHkreAiTYloetEajfXPjiJqP1kOU9tqoFXgoUcZ1Bx5 Z3YyExGnsrUTyaEs7MDFVuFuipUzpkQJH3G1OP/+Joecg3nviWDdgDkNDI4Wglb3g5lTwO 8bQYticf0VIYCXCGWXgK0Xvx6Wl/BBEZy4ObWYtt0QBa+0LfwLp+KwvHln5jlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705342078; 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=RaMEbE7ZoJfQhPOiiBxw2febOoKutI7ifisSAoINnwI=; b=xxFVIyCRUNve/354iC0dIwOGxyQn1QqrwTHE8YIXdDNXepsKiPSeUvPybNRMmLMx+wUetm T/nsRQNtZNw1vYHvZwoSvcZP1msUMCumAFBNoqj4CYz8eGRUBIY4ZhO/Y7g+3G61zYe/0M 5yIh0NfgPWEG+QRrn8HxVLEWe4+Dwb39Q8ew9hR5ejy5i2FuGIoCqzWbL6dKf2OZ/IQehG 6v2HFdxAxh4d0wnmWEHLc+aUjMXPDDMI9jHZOX7yrPwUDCA2GYiraV/LMI0ZsZYtzNLtDF KthakU2fLTA/3lyG/Gpcc3TeiCoFJeBao50GZQ/p5qdneVKkLCeFLpeBIYshDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705342078; a=rsa-sha256; cv=none; b=s6MNdP8EuhW8FjELVA2j8XVEwGFWks5WEWrxLTJnnAB6omsm8yEWdKzmDNViSIKV/00eCj 3bWDcyA3kCJr+HCUyeSREaKEdWABdJPusFtetRRlrS51Gn5SdPHPCnAXBSdpC+wjvbGo55 /175Twnu8mBDsd1NxixkPVwn6y1qJMCeZdpnieEjdACthMI6Z/O41j3Wp+TaCUnohKcMiH WYhRLfPCoMIhKBC1fba6F1VIhQ01PG3cGh4PUXkGOPfyu6gtEcK4l82kQr4k5lzH7HWSUY 4b7ymIlLWlKx7IGNr63v/fUuK3cYXRtRP7dzW1rhqEhcuyJjIDEkqNrgKN4n4w== 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 4TDKqy1L4nz16DX; Mon, 15 Jan 2024 18:07:58 +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 40FI7w0l080278; Mon, 15 Jan 2024 18:07:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40FI7wB1080275; Mon, 15 Jan 2024 18:07:58 GMT (envelope-from git) Date: Mon, 15 Jan 2024 18:07:58 GMT Message-Id: <202401151807.40FI7wB1080275@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 61b0092be751 - main - condvar: Clean up condvar.h a bit 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61b0092be751b8241b65cc14e4167d431f1e5ad8 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=61b0092be751b8241b65cc14e4167d431f1e5ad8 commit 61b0092be751b8241b65cc14e4167d431f1e5ad8 Author: Mark Johnston AuthorDate: 2024-01-15 17:27:11 +0000 Commit: Mark Johnston CommitDate: 2024-01-15 17:27:11 +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 --- 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_ */