From nobody Tue Sep 01 12:50:09 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 4hZ5L96MRMz6qpWr for ; Tue, 01 Sep 2026 12:50:09 +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 4hZ5L95Z95z3fr3 for ; Tue, 01 Sep 2026 12:50:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788267009; 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=4sBHx9bLobnn+q1llitOx2nZN8gtZo17lJyLmeO3TVk=; b=b1VD8kUkUO4Srgnh4kMSPrR7efFsjuwzY1m7dF1Zo34dTwLoFdA8k5wQlAwkBuGL7X9sBa 8KWuUTaZAeA3Ec/aFcUua86+Ay+ALEkjtDC/3V1UCr3qUWqfQ/pTKCwRcj9tfW6jy6EMI2 lFGVXYb1OEFr98ii1wyd0pGiJqTPhbhyr3w2FITig4xEJSE1dhYtr+ZX4HbN6U8SQ8db1V r8W0Po6bKOIdNN6gNI0smL0glayeD3Anlp1rODWg4XLDryuimDGEiQbMhzqs7Eze84Z717 T5i/43VqU//4pqoaDLTFXuaLqrnxWS3/OZG0EeDHTaesNpbydoWFHiWx9LJUJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788267009; a=rsa-sha256; cv=none; b=tHje6y3+Pi5Yuaqg5wOMyNNUMVDd2FUIPnx5UYKxT3ktfUKM6ds6N02HJ3GeoA+8gWvtA1 NC0jEQ0vruTIrYLB9758aniXomUxevmf2j9PpN+j/tYCHlDxk3+kh5AE87mWKO2nT+PEth Z/bdsj8IvJ63uWKayWdcRjQKHO/Fhsh1zkNRQ0vjnt9vJzCAHE920nUcOAYLlZBUO9sxbk lWHFb/tno/elMaFG3EK5OSrtphcQShe6eMKgSANcPxITgS2lWF4IH+HfiTfsSMpuNp2x68 WHTACJ7NTJ9iin6O6TXDyEwhR+RnyAk4TcDMnzbx6kX4sq4FpK5XZzj9WwdOxw== 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=1788267009; 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=4sBHx9bLobnn+q1llitOx2nZN8gtZo17lJyLmeO3TVk=; b=vTutI0fvs6JRfShs0vkOtgNF+8EY91n7OMhRiZgAwKVk/4aVbMihbpovfZiZwARKj7Mw9g i96+syqNa4cvick8HMW6zcqRikzR1BlSYyfcSUeZX/wOtmKPBN0qMLSJn8fuNWtcM6vTqO 4XSz6zWydF9A5jBOel7JW5Opqq5Xwk7Xl0MmuazEfVSHv4Bd7NiJZQYJkbRexio35YmHpE uj2qfhTeCdmZN9qDEsvVlabfgXZ5y8YQ5UEdUahm9yt6UKTSCG2RzIRWX071AHn3qQLVPT 4e8lszQ6vlLmwa8hwMI56jl3qg0Jx6nD2EC1PjCXUET9BVk3NsG6MFIlaoNRgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hZ5L943BrzyRB for ; Tue, 01 Sep 2026 12:50:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 440ca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 01 Sep 2026 12:50:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: b5ecbcd26cc3 - main - vmstat: Drop vm_cnt compat hack 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5ecbcd26cc3a80831c7ff38433dc5f9c3ced575 Auto-Submitted: auto-generated Date: Tue, 01 Sep 2026 12:50:09 +0000 Message-Id: <6a96ca01.440ca.641f5864@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b5ecbcd26cc3a80831c7ff38433dc5f9c3ced575 commit b5ecbcd26cc3a80831c7ff38433dc5f9c3ced575 Author: Dag-Erling Smørgrav AuthorDate: 2026-09-01 12:49:57 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-09-01 12:49:57 +0000 vmstat: Drop vm_cnt compat hack Prior to FreeBSD 11, vm_cnt was named cnt. When it was renamed, vmstat was modified to fall back to the old name if the new name was not found. It's time we dropped this. Reviewed by: kib, jhb, emaste Differential Revision: https://reviews.freebsd.org/D59255 --- usr.bin/vmstat/vmstat.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index d8d33cb3a3a5..24421b8e9ca7 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -294,22 +294,11 @@ main(int argc, char *argv[]) xo_errx(1, "kvm_openfiles: %s", errbuf); } -retry_nlist: if (kd != NULL && (c = kvm_nlist(kd, namelist)) != 0) { if (c > 0) { bufsize = 0; len = 0; - /* - * 'cnt' was renamed to 'vm_cnt'. If 'vm_cnt' is not - * found try looking up older 'cnt' symbol. - * */ - if (namelist[X_SUM].n_type == 0 && - strcmp(namelist[X_SUM].n_name, "vm_cnt") == 0) { - namelist[X_SUM].n_name = "cnt"; - goto retry_nlist; - } - /* * 'nintrcnt' doesn't exist in older kernels, but * that isn't fatal.