From nobody Sat Mar 09 05:40:09 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 4TsBhB07yrz5Cvs1; Sat, 9 Mar 2024 05:40:10 +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 4TsBh95Gqjz4v5h; Sat, 9 Mar 2024 05:40:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709962809; 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=ZHsUh7XtOzNK2tvbzDdrQTCQkDbxTGQUWlVu0gKuijM=; b=sM7PkyU4fBaEUIvSeHErZSsdOWf0lRcNpHbrTjeuVgjpySWAoY0gMY/lKN1D2FVzrgmpYn nSkXITu4NqrsTQGCkR9oNszRZdJHKJOPn8X6aNCFY95/NUkelwSv4zUHXs9HUwGtKEN1pP 0WQCDC7k+Q6xdzdTvsWxWgbSMNswbVKpNVU9K4bvBR/qh09RA9+SGEDiw0vR0kz8wrKpIV EDMUvUz3Sbp/eiLfvLme73t8YZB3uR/TcD8a93zNYNbxTKRNA9BetRbRJgKfvcElVAE59J CL7ee6/5Y807zsVRPqsoxsJ+c2WjoDpwXZT1LUT9rbCWh+canRWVXGvGFAuLgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709962809; a=rsa-sha256; cv=none; b=ciYlThGdNdo04ES4BocsX2QmJP/EQeVwdX2VEl6R8dLpt+ik5lR82QuR5bAAYgNwlciGLn IDJ5BZlxXoxyAFuMpFRozJ3WBYc0LV7GCojD+4Gai4xHXQqffT0BkoizEkRayHeKKPYSWa 2fX1pl/nVA6Zxdw/lTZBGsgngoSORDIlIsZ5HYm2TVERRt3LB6Ehn5HCv3/wpqnLQzUDxq NYMmu9Pe9Csk15/NWvn8Dspm3jVcsj0hoCqotgOFwTavHtOsibUIVRzGnW2On3S+jeSBgG BZvQLuRytUZBFYoQ2Fkk6jScLeRMOp66ggtEC01Wf9QEeNzODxp2Ln5TccujQQ== 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=1709962809; 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=ZHsUh7XtOzNK2tvbzDdrQTCQkDbxTGQUWlVu0gKuijM=; b=etuzXFCN/qqT62BOUhbZFGSwFX18JGg9QJA5Ev8w/fOWA7/BoBqG8Vrhb69w2ZetALgsZU LSTmv6BuPlaA4npV+isyzY6xIXSq/farRqubSsK350t6ojRhd0ROWlnf2pnyb6wRkgInOt t2fylVHvVxUDhfsriSVfmaqIEuZ/3cl6ADlWqXVzShh9XWTgsV8+M5gdkLFRQbupRKil9M rL6O8RwseyiefQ2a9Ic7V8RzeqkrW1x9MDJNL1gASuySeRLwzNx/gjUFW/Kj74ulTN37AJ Eis41+DNFx5zoNGSOrQeIoj9PTndjPY838f/fm95JoUeb2n+xxga+5QPx/ke3A== 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 4TsBh94BR0zqJm; Sat, 9 Mar 2024 05:40:09 +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 4295e9Tp027405; Sat, 9 Mar 2024 05:40:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4295e9pG027396; Sat, 9 Mar 2024 05:40:09 GMT (envelope-from git) Date: Sat, 9 Mar 2024 05:40:09 GMT Message-Id: <202403090540.4295e9pG027396@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: a58813fd701e - main - 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/main X-Git-Reftype: branch X-Git-Commit: a58813fd701ea4b248cca0dfab9971d863fbcf6a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a58813fd701ea4b248cca0dfab9971d863fbcf6a commit a58813fd701ea4b248cca0dfab9971d863fbcf6a Author: Mark Johnston AuthorDate: 2024-03-09 05:11:01 +0000 Commit: Mark Johnston CommitDate: 2024-03-09 05:33:55 +0000 ktrace: Fix the build when options KTRACE is not configured MFC after: 1 week Reported by: John Nielsen --- 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 0d470aeafcd5..a55863595ce2 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 f12054a04b23..c7258b3cffa5 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -60,7 +61,6 @@ #include #ifdef KTRACE #include -#include #endif #ifdef EPOCH_TRACE #include @@ -131,7 +131,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; @@ -238,7 +238,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);