From nobody Sat May 06 17:49:40 2023 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 4QDFS42D5Jz49sqj; Sat, 6 May 2023 17:49:40 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QDFS41n1Zz3FjX; Sat, 6 May 2023 17:49:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683395380; 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=o2ViLG2XzC9wpRfzpT5jCpzwupRZhPbRm5h358seEAM=; b=fK6Qx8/LQrILNlR1P0oYEbdWVo79/dYz56mihu7H81jrq5vwtwq9afJa0sx/tn9pe2hlys Wk0/HTYU2d1ge3ggAEsBwV6XHdzv0bvpMd/QumMCKz9OWbIbHqptCV8JDHhYp4yhIylUBA ug5AcLk0E4pZgROmVhQv8AXCzfdlqWrvLDLtyyiPuFrmDEhnR4fRyjeb+V3ex1+AEpYXIB +oY6a+qXXI0KxmN9SSlijQvwqzXOCjADyEKWB8H5MAHXGB5/rJqipjRh2rHoLzyL8Tagxi cX1JjsVwuPAtRQ78u1doo8Rbtr0yr014j1RxRsWZm2QyHgae2Ey4/iKmDeW3cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683395380; 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=o2ViLG2XzC9wpRfzpT5jCpzwupRZhPbRm5h358seEAM=; b=B+Ku4I2cQMS9ihZgLDfeJcvjB1PGRZt5kysqwkCY3zHbJ7yCXTCfDdCP40i9c71FkfBE3F OwGcN2+dPItONfcTWh9JiFGaFeGQbZjZ8vTFnVoH7+bnzeQOt/CE+psF/rKFlxLniMtz1l K2I3tfjk2443O7S9IucG17jmFB3Bj28PnqET0+rRFJhGcvEiDuNeSkKBHWbh/WbFdTAJDd KqIBWkIQu75cc0EWpisEldFdgNWDpfUCD82KnaX4pefalPM0ZOCTOet+sI79dqZhD6ScDp iZfJQ7s1doYxFdtolJWrCLTb9T5jzzMWQLAjj/YpGDem6fCToIVTPiDaiAsE0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683395380; a=rsa-sha256; cv=none; b=Uw2axOIBsFPZJfyXRm5UCz520Fjdof8F38CSC2WGxaq8XftOToZpt4Bkyy3PEWFDgaPeUJ S3XXcaooKJcE6so6SzyOozxmQ7cl+Jlo2j9w8kb8dN2g+Kq8DAONR8nM1u4kqgroIhHqHD pdaJfMx0OxODaVnEXqRiF9a+PXLy0AVYSiNp8MRPnQA24lBidVD+OX9XsgTHrNA4T6AO+1 tv3fTDTTW8kBSNOUCnEORJdRHXpetZbZGLCjUAl08BZVRbsSp7hy4x/2DbRwSq6Y221puv QA42Axae2CBjFRN5nAXDI//OnyL9i+ngLKYt+a+XO4z05eQzUxDnaWe4iI+M1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QDFS40psMzmHy; Sat, 6 May 2023 17:49:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 346Hneea017844; Sat, 6 May 2023 17:49:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 346Hne2d017843; Sat, 6 May 2023 17:49:40 GMT (envelope-from git) Date: Sat, 6 May 2023 17:49:40 GMT Message-Id: <202305061749.346Hne2d017843@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 8bd4459560f3 - main - pmccontrol: drop Pentium 4 special case 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8bd4459560f39bdbccba76a21539136a7a44b9d7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=8bd4459560f39bdbccba76a21539136a7a44b9d7 commit 8bd4459560f39bdbccba76a21539136a7a44b9d7 Author: Mitchell Horne AuthorDate: 2023-05-05 21:57:23 +0000 Commit: Mitchell Horne CommitDate: 2023-05-06 17:49:18 +0000 pmccontrol: drop Pentium 4 special case This is dead code; we no longer support Pentium hardware in libpmc or hwpmc. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation --- usr.sbin/pmccontrol/pmccontrol.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/usr.sbin/pmccontrol/pmccontrol.c b/usr.sbin/pmccontrol/pmccontrol.c index 1130c2c07b20..c1a1040ecfbe 100644 --- a/usr.sbin/pmccontrol/pmccontrol.c +++ b/usr.sbin/pmccontrol/pmccontrol.c @@ -241,11 +241,6 @@ pmcc_do_list_state(void) ncpu = pc->pm_ncpu; for (c = cpu = 0; cpu < ncpu; cpu++) { -#if defined(__i386__) || defined(__amd64__) - if (pc->pm_cputype == PMC_CPU_INTEL_PIV && - CPU_ISSET(cpu, &logical_cpus_mask)) - continue; /* skip P4-style 'logical' cpus */ -#endif if (pmc_pmcinfo(cpu, &pi) < 0) { if (errno == ENXIO) continue;