From nobody Wed Feb 11 05:17:36 2026 X-Original-To: dev-commits-src-branches@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 4f9msD4RQ8z6RtSF for ; Wed, 11 Feb 2026 05:17:36 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9msD3Vggz3Sth for ; Wed, 11 Feb 2026 05:17:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770787056; 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=5/Lso31vjWpcWHZr77AUpBW2LoQzxavJlR30c+eQLGg=; b=AcBw9MXATaQtQVovAkc7zp/qMnCmFqTohH8QUsAPxK68kk4Cxu1as+XmVlLyPlTQjskBAl a+6wv1lfMMYfLqhpPVVKG6cunWstNoaKpO7SgxIKPbFrPmBqnV+DWYL00t8OsnSbOaZRyC nHn752NZWKJ9gsXnL2LvUdxGU23lwMfccWoOJvy4ez8vc9kPgs5dHoNMbacXVEXYnLpHZo N81F3shALkpjQFM5+gY3S70+DzHmhRcNV2MDBU50th7TYwup4zjxWFlzONISF/2BN3U4uH NOwdzcizy3htj/6Hk0gXzpqD/c3OPDHnXv7Nho7d42ScmZbufhcNZ5V5bxZkOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770787056; a=rsa-sha256; cv=none; b=XgXYIEBYoGK35b1xyZ6kKUULylx9WdoTvuCSaWJS/9loMOpDfCo4re+bU59unOWKLHbgji iJejFMG8RGibH3PohAEWDV0peyjASkXkWEGLU/Ivxmxg3+KQXjdQyf82EVFAFUEs5K3oCx Q3OdcFUs2QcApnZtrSR0sK+9sf3GdjjyQHAAEavMEpHBdyrVAvDl4VmjUzbsuulDsGBGCS llqRhmrLNaC6G8hO1DDiwJj8qjyTTVIGjQloA1lg2v8c1q+aK2u9yA79waYc9y1MUtwyF5 c4LOEt4mqUpiByEvzs4Ul4BZYGh6Xp2M8mW9867YnjkHwKg0uX6cEciq7Qz92Q== 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=1770787056; 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=5/Lso31vjWpcWHZr77AUpBW2LoQzxavJlR30c+eQLGg=; b=r+RWmsh+45YnO0eCxRC7L4e1607pkWFxbqw6P/4KLjD4cRwuHt0E2o93oyiakoPzPGM+b4 qo/octv/xtoDFe/JdBfkWESI/oUMp7rXvhYLb2hfVbuc0/RB02jq7AiwooMaaoJMGm4QOL h/SaNA0uGmBHSgDp7GUwLqu5xmj92IwnN1GINJIWg7caOxTDSMzvc2V85GkyId3t2Mpkjn 4gWTucZoqS5Fc0Skg5LTxG9a0KVT6hkpze0N7WCDbEc9FMSVJ4TBF9KjFUiq/dpZB66F99 ++kxjjTvFiWGzuqvL3Yx3xJVAV298Q0nnRsH+Vr6l0dpNxQZS/pnFZxphT0IXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9msD2rJczcfV for ; Wed, 11 Feb 2026 05:17:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26455 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 05:17:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 20f2249d3913 - stable/15 - kern/sched: deduplicate dtrace hook vars List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 20f2249d3913e8bd5fac979df475d5e789591803 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 05:17:36 +0000 Message-Id: <698c10f0.26455.16420b90@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=20f2249d3913e8bd5fac979df475d5e789591803 commit 20f2249d3913e8bd5fac979df475d5e789591803 Author: Konstantin Belousov AuthorDate: 2026-01-24 06:22:01 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-11 05:12:37 +0000 kern/sched: deduplicate dtrace hook vars (cherry picked from commit 783b8a0fd880255a8315db7f59d0450bd7276f4d) --- sys/kern/sched_4bsd.c | 6 ------ sys/kern/sched_shim.c | 6 ++++++ sys/kern/sched_ule.c | 6 ------ sys/sys/sched.h | 6 ++++++ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c index 57d6f87a4dce..317b47da2cca 100644 --- a/sys/kern/sched_4bsd.c +++ b/sys/kern/sched_4bsd.c @@ -66,12 +66,6 @@ #include #endif -#ifdef KDTRACE_HOOKS -#include -int __read_mostly dtrace_vtime_active; -dtrace_vtime_switch_func_t dtrace_vtime_switch_func; -#endif - /* * INVERSE_ESTCPU_WEIGHT is only suitable for statclock() frequencies in * the range 100-256 Hz (approximately). diff --git a/sys/kern/sched_shim.c b/sys/kern/sched_shim.c index 4f000d8ace0c..ec5c42c37aab 100644 --- a/sys/kern/sched_shim.c +++ b/sys/kern/sched_shim.c @@ -120,6 +120,12 @@ SDT_PROBE_DEFINE(sched, , , remain__cpu); SDT_PROBE_DEFINE2(sched, , , surrender, "struct thread *", "struct proc *"); +#ifdef KDTRACE_HOOKS +#include +int __read_mostly dtrace_vtime_active; +dtrace_vtime_switch_func_t dtrace_vtime_switch_func; +#endif + static char sched_name[32] = "ULE"; SET_DECLARE(sched_instance_set, struct sched_selection); diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c index 33a578814e0e..ccad7947c4f5 100644 --- a/sys/kern/sched_ule.c +++ b/sys/kern/sched_ule.c @@ -72,12 +72,6 @@ #include #endif -#ifdef KDTRACE_HOOKS -#include -int __read_mostly dtrace_vtime_active; -dtrace_vtime_switch_func_t dtrace_vtime_switch_func; -#endif - #include #include diff --git a/sys/sys/sched.h b/sys/sys/sched.h index e4bd5211c1ae..08d8636aaa68 100644 --- a/sys/sys/sched.h +++ b/sys/sys/sched.h @@ -245,6 +245,12 @@ SDT_PROBE_DECLARE(sched, , , on__cpu); SDT_PROBE_DECLARE(sched, , , remain__cpu); SDT_PROBE_DECLARE(sched, , , surrender); +#ifdef KDTRACE_HOOKS +#include +extern int dtrace_vtime_active; +extern dtrace_vtime_switch_func_t dtrace_vtime_switch_func; +#endif + /* * Fixup scheduler state for proc0 and thread0 */