From nobody Thu Jan 29 18:12:42 2026 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 4f26gb3sgJz6PfH1 for ; Thu, 29 Jan 2026 18:12:43 +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 4f26gZ52cxz3ZHq for ; Thu, 29 Jan 2026 18:12:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769710362; 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=On4jg7CI+bx5RLzoHQYaEP3YccTpakTOS42ALzJXPvw=; b=hQ+7NzGanVfUF/p+9kdIba8a9ReBe/gkkFfmugX7IobMyPXr5yPJcII01VEQYYy59eTaB6 nWq1JWQ2AkmDdtTFylRI2GD5J/pveGW/fQeJcBBulth92bW4/oq7UPIxBX2ZVdjrJgEGYZ 0KuAvtHba/gbOaQLCdkAPuyRPVCM45zxKLTm2si0JD4X/aX6zA2YoHci0Wq7DR/ssKp9Pu fld24usOQfLKOg4DfivieW2LWFkXJ9qRfUIEd52yavafaB898r+KobprcOgTZ0Lt9m/g+W c56CTlyHCgSwqKJClkUCeGF0SyrCfRaWnl08z0Tt4u84CLeBdseVf7g0D30YZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769710362; a=rsa-sha256; cv=none; b=vTSgA9jY1wD8gTddXFuVzrzbCpyxWTJrt3MMIt8osQur4VIvXWQUBvxdbPssXLcClekrpa wy2rhCfy62ALNSik/wx5XaMI4/V/2fpyH3Er+bc2AZ01n3ZYscW9O6syjTbcBpI8Zxw0nO bU758ClzPBEwI2XwFxrpA+KVJ22zBEQqzADqxnVBSRK0RWWukj31w+eUB/34qVY+v1osMN 79i+r8Zhpsc6RNqdn65xH3oesBj+3jThvmEP8LNEQX/zia6UR8lLBjocnr/KR/YrQoyyoX E2oUr55oSjq+IFHnocq/ihFRjmTOTTu5S/poEf9UmBSSmWAUnP9I9ALji5PiHw== 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=1769710362; 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=On4jg7CI+bx5RLzoHQYaEP3YccTpakTOS42ALzJXPvw=; b=G1KoLTnvcwAzWo4kosR4/xid6dTf2HvRJLA2i+5xK0i/XFecRwwzUUvtTOpeFUtn60l4+3 QZ3FZKdjIjIDhHxp++KDsLuKvAbeA2eU9CjqT4sb1fMdJbr4xwy/D4/jJUcfx6rZLnG6/M TPlTQj6XjFSYSQrC1VjkmE8oyFaB09jjvD+tN3RxIuPzXhZVylf53jgZHWQQq+j1XJ7PzH /1fo9sM/Kco9BRRZpcukSviap/mlmkllVXKbORTstGqrn32I187HnIntHr2HdvjqIpqKId Rk3nzETEItQfLKBakiTTIGNpiYe7+kD9Rus6m0173wTmDlBRHGQROV4/Pvv04Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f26gZ4bXkzq5t for ; Thu, 29 Jan 2026 18:12:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9b3c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Jan 2026 18:12:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 783b8a0fd880 - main - kern/sched: deduplicate dtrace hook vars 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 783b8a0fd880255a8315db7f59d0450bd7276f4d Auto-Submitted: auto-generated Date: Thu, 29 Jan 2026 18:12:42 +0000 Message-Id: <697ba31a.9b3c.494a86f0@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=783b8a0fd880255a8315db7f59d0450bd7276f4d commit 783b8a0fd880255a8315db7f59d0450bd7276f4d Author: Konstantin Belousov AuthorDate: 2026-01-24 06:22:01 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-29 18:11:56 +0000 kern/sched: deduplicate dtrace hook vars Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54831 --- 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 */