From nobody Thu Aug 27 06:34:32 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 4hVsF51lVqz6qYc4 for ; Thu, 27 Aug 2026 06:34:33 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hVsF46XrVz3rQ0 for ; Thu, 27 Aug 2026 06:34:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787812472; 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=6mfm7Axna1MM3OqkM9kfP/rPDST37yHuoHZ8oR24nCc=; b=uyOt0+PPA9H7dEJnq1xgThzdYkECA2/GFjpHYs9VzHSk5m7sWLEMQLsmBe6Kku19q/15/6 4KICJHL2UCXjhmhZ7g6XHysevhgGFDwIGM9/vBlVx1v+jlZhWVGL6xGf9t3QG9XCnrgEQE 9J8GO44oUa6UhmJw42UkbogRyiiPWM10EjFfvQS2H39+USpelVE2sPma1/xzRdOt0aXgkS I/2jamN8GYkc9o+/j7q6IM9iqSKIoDF1wLDgdHlo+0/BIkhiJ4YYzR3AiG+l8mO00IKlci 7vEYO10nzALwxGvIevVKizJ988cpqvSltQBKDRHnH0EmrqnrZ5s2eC4FhEnUDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787812472; a=rsa-sha256; cv=none; b=CEYYVc1fN3/GKOVPE6ezbtPmkg7HAbg1KBSNuqHcIsrKbsW0ZqZl4M8UvqzJ3ejPxGq/5F FHNr8yWApgs8yrx1BghEctGIxm+kfha623cLSN6WOfupdZsm7rJpqxxhsENTGjgXnCYpKB 2UbMwFQg7nIHImQxXXfxrDiZAGXB8k7NJprBj7XYzZZsoMUtmmmxoxRIlQ5soHRnan1K3H wpt1+eXL4v0SeMn1HwlxsK4De0TB6Qg0tRjoAstvQlm/VbVeVGPkeHFdW6pLxJx5Ad87PU 35dGbOWH8EDIAGNnZpo5ySPFo4vBDu/At9KhxBBBdJZ6esYR4+uhKQk+diKgEA== 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=1787812472; 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=6mfm7Axna1MM3OqkM9kfP/rPDST37yHuoHZ8oR24nCc=; b=JSdw9reVxlOT65zBkOr0zPfrz58zqG9254Cpyk5PY5T2qqey+hmtsIW7uuIUsx1MiNmqkn 9Ol6VCvJ3JUUNeb0wbiiM+FGOeSkK5JnAQMbNhYHovhOV+gov7Fogiqo/rvCnEYytaAJJ0 XuXG5W0XSfYUjkPkx3WLZr40XC02RTHgeHoueHe9ygxCUXLQuL5F/aHUrUxuKrYKUPiIU2 nDO+6V4swFlRPBXpDuwyzR6rHlg0pYt5OibKbrEMWJ+jiSYTUcsCVUAsTcCCLbIt33PUeX 4imZem/GhsTfhJCuVJCRWdh243S6IsryRHVSt7sgpzkv9q5aUjBDacNw0uF+jQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hVsF44vVyz1BGm for ; Thu, 27 Aug 2026 06:34:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a316 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 27 Aug 2026 06:34:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 9213578be26b - stable/15 - kern/sched: Hide scheduler selection from C++ 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9213578be26bea80095a7e6c624c76480c4ed2e6 Auto-Submitted: auto-generated Date: Thu, 27 Aug 2026 06:34:32 +0000 Message-Id: <6a8fda78.1a316.6f97909c@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9213578be26bea80095a7e6c624c76480c4ed2e6 commit 9213578be26bea80095a7e6c624c76480c4ed2e6 Author: Dag-Erling Smørgrav AuthorDate: 2026-08-20 13:57:56 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-08-27 06:33:50 +0000 kern/sched: Hide scheduler selection from C++ The scheduler selection interface uses names that are reserved words in C++, causing problems for downstream projects that use C++ in the kernel. Work around this by hiding the interface from C++ compilers until we can come up with a better solution. Fixes: ce38acee8d0b ("Add kern/sched_shim.c") MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: siderop1_netapp.com, imp, kib Differential Revision: https://reviews.freebsd.org/D58991 (cherry picked from commit f2366851616083f923e8101363802678a03dc0b9) --- sys/sys/sched.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/sys/sys/sched.h b/sys/sys/sched.h index c7b7b849947c..cd0f3d77b39c 100644 --- a/sys/sys/sched.h +++ b/sys/sys/sched.h @@ -272,6 +272,13 @@ bool sched_do_timer_accounting(void); */ int sched_find_l2_neighbor(int cpu); +/* + * The scheduler selection interface uses names that are reserved words in + * C++, causing problems for downstream projects that use C++ in the + * kernel. + */ +#ifndef __cplusplus + struct sched_instance { int (*load)(void); int (*rr_interval)(void); @@ -337,6 +344,8 @@ struct sched_selection { void sched_instance_select(void); +#endif /* !__cplusplus */ + #endif /* _KERNEL */ /* POSIX 1003.1b Process Scheduling */ @@ -363,7 +372,7 @@ struct sched_param { #ifndef _PID_T_DECLARED typedef __pid_t pid_t; #define _PID_T_DECLARED -#endif +#endif /* !_PID_T_DECLARED */ __BEGIN_DECLS int sched_get_priority_max(int); @@ -376,5 +385,6 @@ int sched_setscheduler(pid_t, int, const struct sched_param *); int sched_yield(void); __END_DECLS -#endif +#endif /* !_KERNEL */ + #endif /* !_SCHED_H_ */