From nobody Mon Aug 31 17:34:17 2026 X-Original-To: dev-commits-src-main@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 4hYbhb2YkYz6r6k3 for ; Mon, 31 Aug 2026 17:34:23 +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 4hYbhb134lz3NxW for ; Mon, 31 Aug 2026 17:34:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788197663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OYQEDwDsah+bLS/5fxhCTMqwkJGnErB1dLfta1jY+GQ=; b=VB6rbo/n5DZKxyA8cjS3mQJOT4VMADqJxOSSJv/lsfRiVZyCnvOqQHRkS3+AYcT9BLq00T aAYPqkhp2i8dDqcMFxjUM2qFR8IOZ48vzn7toLcQKzo0gsTHWW3F/9MhoC0/u6rU6wUTkq IbLA6/dGMVNtfGW3SoY9RlDHyhhQgQrouLd6nkYAnMHApOAOc2FKEfglo0R0Y0lT4G/xr/ RMzL4AHPehRwXi7/QsXGj4L9Od+JTgGlHgVDbPmWZ3eRx5KmqkzKXZlWnx8rAx3N/vQAhG vOSopBSyNyC0YCDR13Xc+XdE3cJ+awgWJSPuegRx3Igj2AvjT/nMmoLRXKVsQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788197663; a=rsa-sha256; cv=none; b=Uqbe4PbQfmhkfaHlcsuRku7dPnnk5MIoLE5kVdzqIO71bw+fO6PJR7X6dJlQ+xlvZs6oaZ KElPsYPGe/8vFTe3YmRmv6yQvXWl93B+98QBZIClWCsHrhLL6vR4oRW4ysN6uLkvJuvbmC FKmLpCzm3J61yRDy934fXmJUovwdn4JhgPGqfinFxxnV5Dod/h2o2/vryTKMGMQFz8lT0M W8KIYZ+T9DluLRa68eLPNPiQ3/9MhgCZ4J6RKMaDKwfQDkta2aZwMY7/0FNyctf1PO3KcL JDefGOPkL/0oeOoBDS7SL9omo7sYi9MbGSiQVFvICWt2OwhfsMURoseXAZ6PLw== 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=1788197663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OYQEDwDsah+bLS/5fxhCTMqwkJGnErB1dLfta1jY+GQ=; b=s/U8hlVyreUhcgtsljcPNM2UuKjm6mh4RFtiO/uIdV+puAj97v5bqS3Yk/AWzxRU+Od54g 2dhz6QhEHY3dtt69VjqFk+rLkWa2FDRtUa8PvVnaewJVJnpn/hwQoB/J/12CmJFueot1cE ql0Ikv3ryMuSmSitiP/qA1WxU05A6zKdMLFu5InFHDlFlbJn2nV3FQVdtZjMcsDiSETQkm Y/DIAY5BMLp0CKf1KNzIgf1JRGSGwrs7t328pfBg28SrNy13AEOP1lTLOFvvxbISU+xqCI hOQP5iQ8Zq+/YKU/6O2Vno6pYRl6LmGJlm7DK12YNT+iaFy+obwrkgMKV7JFBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hYbhZ6NX8z5q9 for ; Mon, 31 Aug 2026 17:34:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 395a8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 31 Aug 2026 17:34:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Christos Longros From: Ed Maste Subject: git: ef03c60246be - main - kern_mib: remove kern.fallback_elf_brand compat sysctl List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef03c60246be23e601c4d08bfd2682f51825f18e Auto-Submitted: auto-generated Date: Mon, 31 Aug 2026 17:34:17 +0000 Message-Id: <6a95bb19.395a8.1121362e@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ef03c60246be23e601c4d08bfd2682f51825f18e commit ef03c60246be23e601c4d08bfd2682f51825f18e Author: Christos Longros AuthorDate: 2026-08-31 17:23:19 +0000 Commit: Ed Maste CommitDate: 2026-08-31 17:23:53 +0000 kern_mib: remove kern.fallback_elf_brand compat sysctl This compatibility alias for kern.elf{32,64}.fallback_brand has been marked for removal since FreeBSD 6.0. Signed-off-by: Christos Longros Reviewed by: kib, emaste Differential Revision: https://reviews.freebsd.org/D56085 --- sys/kern/imgact_elf.c | 2 +- sys/kern/kern_mib.c | 6 ------ sys/sys/imgact_elf.h | 1 - tools/tools/sysdoc/tunables.mdoc | 3 --- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index b8a0e439de5c..c2be0a6706f6 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -116,7 +116,7 @@ SYSCTL_NODE(_kern, OID_AUTO, ELF_ABI_ID, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, #define ELF_NODE_OID __CONCAT(_kern_, ELF_ABI_ID) -int __elfN(fallback_brand) = -1; +static int __elfN(fallback_brand) = -1; SYSCTL_INT(ELF_NODE_OID, OID_AUTO, fallback_brand, CTLFLAG_RWTUN, &__elfN(fallback_brand), 0, ELF_ABI_NAME " brand of last resort"); diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c index ebee2e88bd66..04f5270e28a8 100644 --- a/sys/kern/kern_mib.c +++ b/sys/kern/kern_mib.c @@ -777,9 +777,3 @@ SYSCTL_SIZEOF_STRUCT(kinfo_proc); const int pcb_size = sizeof(struct pcb); SYSCTL_SIZEOF_STRUCT(pcb); -/* XXX compatibility, remove for 6.0 */ -#include -#include -SYSCTL_INT(_kern, OID_AUTO, fallback_elf_brand, CTLFLAG_RW, - &__elfN(fallback_brand), sizeof(__elfN(fallback_brand)), - "compatibility for kern.fallback_elf_brand"); diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h index 25ce7871ba7c..57b2a5f6ff55 100644 --- a/sys/sys/imgact_elf.h +++ b/sys/sys/imgact_elf.h @@ -131,7 +131,6 @@ bool __elfN(parse_notes)(const struct image_params *, const Elf_Note *, /* Machine specific function to dump per-thread information. */ void __elfN(dump_thread)(struct thread *, void *, size_t *); -extern int __elfN(fallback_brand); extern const Elf_Brandnote __elfN(freebsd_brandnote); extern const Elf_Brandnote __elfN(kfreebsd_brandnote); #endif /* _KERNEL */ diff --git a/tools/tools/sysdoc/tunables.mdoc b/tools/tools/sysdoc/tunables.mdoc index 397fe632322d..8ec259da783f 100644 --- a/tools/tools/sysdoc/tunables.mdoc +++ b/tools/tools/sysdoc/tunables.mdoc @@ -687,9 +687,6 @@ time after modem resets. --- kern.elf32.fallback_brand ---- -kern.fallback_elf_brand - --- kern.file struct