From nobody Fri Jun 09 19:58:03 2023 X-Original-To: dev-commits-src-branches@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 4QdBhW4J3Rz4cKdP; Fri, 9 Jun 2023 19:58:03 +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 4QdBhW3ZC4z4JJs; Fri, 9 Jun 2023 19:58:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686340683; 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=MGmqKaTGqxs+jUN8zQme+y8S+6NHjtGg0T7Xa25gwec=; b=T2uBtv0BwI12Ideb2EOd7x8RFq1tmFDQAMzuiqpVOt9XgaRF/rIPzXeFz2EyjSHwvjtP6M S0ZpixfnHWRdfIENIdWE3P6HiS0vAFoPgnO95/P+qMBrQLPnbhW8TtZvukOd7Ud6cUQrWa vaoZU5JjsBBF9PCBfXMolAp4kI9tgC8yXeIjnai48dMsWRtaqZPFEjgPQA4E9XGjpi/lJ9 SitiznTvhWlAoQ+f5gJwNUeS9GH/6HWV6TKI3I6qkBBh2SFPmjU42xZMkSbzfb7ktK4IQ0 6szSjLAMhUJTmbTjcOIYtTnkdYOxdvRsDDZ4qDrqu6MYEX5Ow+0UHe3x8pssqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686340683; 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=MGmqKaTGqxs+jUN8zQme+y8S+6NHjtGg0T7Xa25gwec=; b=DpAAJcJHLmS04WunYRtj0XcgdKAr5Njsf+Ls7FizHLt8IACO/1YCeGYAXRTvuv0rKJJkSE 05l0qJ6LT1/5vjFZtcO/44idq3kfVOq6damlrRqGOZTKZ2Z3/hpKeK/sRrGRSapXKOkos5 nj6toS5oHDyivC6ch181ER1WulxrV7ceiuNUcPChctlPzl+pRiwSX1cofJ6fFFh488oBiO 02uPZAjpn3Ctn84UxW1E0IOhC7UQ+sRTfPJlg/JoQKqrQJ109Ul/w4fvGo8TVjqCLsMiQK eswjuLtiwmeew4uwmyb7pYZ3PIxX2/rwrtTkGuijT5MXdJcKWmqvISgWlOU/NQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686340683; a=rsa-sha256; cv=none; b=IHFnpRJIEi0bRKJGdMLn+WsQuxTqHdQmPWxTMYrq6Np5T/J7K/1BInzCcwBiCLqaKoe+f4 2Em9ZXKRSYd5eBvXvOnaimbNfG+vFErzYNZxtz9HgVwdByMF5uQrzXdiIkIYtH1EXLi0FT WGpacc/amZUmnmhEeS0euWYWBq+AwNuFprsUbnKA661TaHCt7x0GewVQRyQ5z1+XZbIbDF ZzymGSAkL5wb+4d6geaRw17qwBZmvSRR96ANhFuSwufGorb4TRT9rDMH7AAjRdvqbjcRzW 4W+A700BWL8HJrEYhW8V24DgbOXtjzm9/H/tj+OKHOEjlbQsL1MF2Chxe+9NKw== 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 4QdBhW2hRlzp99; Fri, 9 Jun 2023 19:58:03 +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 359Jw3bv072066; Fri, 9 Jun 2023 19:58:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 359Jw32r072064; Fri, 9 Jun 2023 19:58:03 GMT (envelope-from git) Date: Fri, 9 Jun 2023 19:58:03 GMT Message-Id: <202306091958.359Jw32r072064@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: e456727fcc3f - stable/13 - pmccontrol: drop Pentium 4 special case List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: e456727fcc3fe0e2ffa68ee225f93382707c1323 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=e456727fcc3fe0e2ffa68ee225f93382707c1323 commit e456727fcc3fe0e2ffa68ee225f93382707c1323 Author: Mitchell Horne AuthorDate: 2023-05-05 21:57:23 +0000 Commit: Mitchell Horne CommitDate: 2023-06-09 18:14:58 +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 (cherry picked from commit 8bd4459560f39bdbccba76a21539136a7a44b9d7) --- 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 9d57a2923784..70f716826223 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;