From nobody Fri Mar 29 18:11:44 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 4V5pQ92gjVz5FNW4; Fri, 29 Mar 2024 18:11:45 +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 4V5pQ90xCfz4gxZ; Fri, 29 Mar 2024 18:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711735905; 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=+JTilZGr4eZF8rg22/4PZcLcX4akmFc49DmfoaBklIQ=; b=KkQg7ONCTfClywbzNlrCjkORYH6YLHSFwAwNYE61OHvcF1ppooe3lwuokDEUCef6LStLWS sYu5r1tW885xk4RSm0ICLZR0yerbLNsQfk1pfIJ6mMyWxx8w2DFh0Rg/uMx6f7aEHpXE4V Mrkpu8dnenJfeAScjwPaDF2ls1d+rZLVBWKtjuJFHzZ6n9W0KDpKm+TBLmiLQTEDE/QVUe VgEOhya1b+w9H+fZAn48gznyHK/5YAkIQILtkANsBwTRAFka9W+ntLBk48kPnFlEASVUAg XnUWFzx+qTKbU7AIsn4SjPWTE/3+pN4FACHP+avb6bjYUw7e3C6UakXv0Ck9FA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711735905; a=rsa-sha256; cv=none; b=EUHb6sBORhMlGnKhsC+laAEdLPAxT401Ta/2KkDDatvZ5rKyKfasecpXW71pbn/FEgXDjh mzprMM0nj8EDzi7cbnQOw4Z62Ig7RprJ4C+Q1nvhTajfW0wBwaCkIb3SU8b8Cn/cExYsGt 7PQ9t4yQjoKPYNOicMnrwohrHk1V1/bV5feZ413KS59STi3cIEm3kDCliEb9+4Up56HOpe wUppNAe5gbIhqQDGw+bkbTuvmK+ZwQKPYVE08D9MPPkOTyj8p092tD9BlVRZGrzsim1Fnf 8NUiN2n6TWbetEyvu35jSHpS2V1klGBsGJoAuUqbyLrEQtzM46wcTr0P2S4yNQ== 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=1711735905; 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=+JTilZGr4eZF8rg22/4PZcLcX4akmFc49DmfoaBklIQ=; b=jVNl3L0/0SxtSIRB8GSiDZRMwjqK4tXkWG3Jsxtls+NtvvtCGJWvpPmn5Wfo8hlplZSbKl ZyEyVMGLjzwxUXZGyyhPtAyRH0TG0sHi+L0IoROmfGCqMD0VBm+4kWGus0VH1cN/y3WpXw E67U2u7oHr9Tjy3Ht/T8W/0vN9K9TXblw9BZtZcGE4NECsrONrk3zXRgay/V5M4mz6q+Em ywSQVeIpaBT2hId6Dtif34F8Lfh63EJ7G4z6GeZroptvF6Lc5g82ByQIiu4xNGFCl8m5h+ Hp717mh8Vu1pGxECNEOH+8XLantLQEb/MxWre7hLo8Jn1gt0zKI1lu9e9XgTMQ== 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 4V5pQ90YQjzM39; Fri, 29 Mar 2024 18:11:45 +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 42TIBiFR077988; Fri, 29 Mar 2024 18:11:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42TIBi4a077985; Fri, 29 Mar 2024 18:11:44 GMT (envelope-from git) Date: Fri, 29 Mar 2024 18:11:44 GMT Message-Id: <202403291811.42TIBi4a077985@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: 3ba61343f708 - stable/14 - ktrace: Fix the build when options KTRACE is not configured 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: 3ba61343f708ba9edabe9e3b2a2e4467bfabd2c9 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3ba61343f708ba9edabe9e3b2a2e4467bfabd2c9 commit 3ba61343f708ba9edabe9e3b2a2e4467bfabd2c9 Author: Mark Johnston AuthorDate: 2024-03-09 05:11:01 +0000 Commit: Mark Johnston CommitDate: 2024-03-29 13:53:05 +0000 ktrace: Fix the build when options KTRACE is not configured MFC after: 1 week Reported by: John Nielsen (cherry picked from commit a58813fd701ea4b248cca0dfab9971d863fbcf6a) --- sys/kern/kern_condvar.c | 12 ++++++------ sys/kern/kern_synch.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/kern/kern_condvar.c b/sys/kern/kern_condvar.c index 2731f581a29f..e4bd1f926c00 100644 --- a/sys/kern/kern_condvar.c +++ b/sys/kern/kern_condvar.c @@ -37,13 +37,13 @@ #include #include #include +#include #include #include #include #include #include #ifdef KTRACE -#include #include #include #endif @@ -112,7 +112,7 @@ _cv_wait(struct cv *cvp, struct lock_object *lock) char wmesg[WMESGLEN + 1]; #endif struct lock_class *class; - struct thread *td; + struct thread *td __ktrace_used; uintptr_t lock_state; td = curthread; @@ -174,7 +174,7 @@ _cv_wait_unlock(struct cv *cvp, struct lock_object *lock) char wmesg[WMESGLEN + 1]; #endif struct lock_class *class; - struct thread *td; + struct thread *td __ktrace_used; td = curthread; CV_ASSERT(cvp, lock, td); @@ -232,7 +232,7 @@ _cv_wait_sig(struct cv *cvp, struct lock_object *lock) char wmesg[WMESGLEN + 1]; #endif struct lock_class *class; - struct thread *td; + struct thread *td __ktrace_used; uintptr_t lock_state; int rval; @@ -301,7 +301,7 @@ _cv_timedwait_sbt(struct cv *cvp, struct lock_object *lock, sbintime_t sbt, char wmesg[WMESGLEN + 1]; #endif struct lock_class *class; - struct thread *td; + struct thread *td __ktrace_used; int lock_state, rval; td = curthread; @@ -371,7 +371,7 @@ _cv_timedwait_sig_sbt(struct cv *cvp, struct lock_object *lock, char wmesg[WMESGLEN + 1]; #endif struct lock_class *class; - struct thread *td; + struct thread *td __ktrace_used; int lock_state, rval; td = curthread; diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 9f11e9b3ed08..2241162f33ab 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -62,7 +63,6 @@ #include #ifdef KTRACE #include -#include #endif #ifdef EPOCH_TRACE #include @@ -133,7 +133,7 @@ int _sleep(const void *ident, struct lock_object *lock, int priority, const char *wmesg, sbintime_t sbt, sbintime_t pr, int flags) { - struct thread *td; + struct thread *td __ktrace_used; struct lock_class *class; uintptr_t lock_state; int catch, pri, rval, sleepq_flags; @@ -240,7 +240,7 @@ int msleep_spin_sbt(const void *ident, struct mtx *mtx, const char *wmesg, sbintime_t sbt, sbintime_t pr, int flags) { - struct thread *td; + struct thread *td __ktrace_used; int rval; WITNESS_SAVE_DECL(mtx);