From nobody Mon Dec 06 00:28:04 2021 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 05D7818BEA9B; Mon, 6 Dec 2021 00:28:07 +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 4J6kmP206Dz4XcG; Mon, 6 Dec 2021 00:28:05 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 5ABAA219CC; Mon, 6 Dec 2021 00:28:04 +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 1B60S4vE084802; Mon, 6 Dec 2021 00:28:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B60S4m9084801; Mon, 6 Dec 2021 00:28:04 GMT (envelope-from git) Date: Mon, 6 Dec 2021 00:28:04 GMT Message-Id: <202112060028.1B60S4m9084801@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f894975dda64 - stable/13 - libc/x86/__vdso_gettc.c::tsc_selector_idx(): cpu_id is calculated but not used 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f894975dda644975cf90b86bc408c11a948eafe0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638750485; 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=N7Yvfcx/JJVCf+nhHpMEannd3M97uMEVL+dm54tFBpg=; b=pvelHgkY5PBtG9Pd9qUq3CRUwyOnJi1Q5RmfA6h4XVxDi6l6Tnu3Cw3Yd23yPaWnOMumi/ lV/fc+2dMkWql/EMrsw7s5pRp6Qt19VjHDKjAumQP+NYqQ8eZ5RBPMS3gfRXIjr5035ei5 xopG86bnxftoyLjWxNG/JxmUSGpnle4ghaK+Dpkk0E357Hvp2pZT15vOD/CI0picK4KBMQ qf0Em/waoUMeunikM87JsC+8kZvTMD6Q6E1/uKSOzEh/LgWxJTfIzS3keaWW436FktIBW7 zpARCQuxmktIkxUBuwofCIZEKGG2lFVToslKhQnEACXClFhkW3kRRVtMDpAjQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638750485; a=rsa-sha256; cv=none; b=tT9LckPtkS5hCTwc+tSTHv8c1+ZRrRHFkzcCICtrP8dEcoATAfPHpHAXVkew96NUCUIZS5 XNbFO3kvDscEt4IPK8afgNn0PSbrtwRk8v77aIJVraGBx5OX/zT2clg9qIqoavYzdBSQr1 GzqZLVWrVkQBnEneBMTiRtHeBaHxX8d/nsey+uXJGONjwnGBrhICCg5A/a4letkBnfKsfZ cTCbjT3QSYp5wDMbUJ2thwDPqyx7yoAfbHZZbvZQ/hR0SXwFjhWMbFL2mqLOupYKdR3Pw1 WZcIs8S9BHc/wPt8YKajTL/uYCrDdr/Hxrw4gdllozFtCmZKgFEwWJlN0tRaJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f894975dda644975cf90b86bc408c11a948eafe0 commit f894975dda644975cf90b86bc408c11a948eafe0 Author: Konstantin Belousov AuthorDate: 2021-11-28 03:14:20 +0000 Commit: Konstantin Belousov CommitDate: 2021-12-06 00:23:45 +0000 libc/x86/__vdso_gettc.c::tsc_selector_idx(): cpu_id is calculated but not used (cherry picked from commit 4b6f4db3410d3d00c5e0e597243bb7d945356213) --- lib/libc/x86/sys/__vdso_gettc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/libc/x86/sys/__vdso_gettc.c b/lib/libc/x86/sys/__vdso_gettc.c index 5cc847e31c0e..b3f3de9f4203 100644 --- a/lib/libc/x86/sys/__vdso_gettc.c +++ b/lib/libc/x86/sys/__vdso_gettc.c @@ -147,7 +147,7 @@ static const struct tsc_selector_tag tsc_selector[] = { static int tsc_selector_idx(u_int cpu_feature) { - u_int amd_feature, cpu_exthigh, cpu_id, p[4], v[3]; + u_int amd_feature, cpu_exthigh, p[4], v[3]; static const char amd_id[] = "AuthenticAMD"; static const char hygon_id[] = "HygonGenuine"; bool amd_cpu; @@ -162,9 +162,6 @@ tsc_selector_idx(u_int cpu_feature) amd_cpu = memcmp(v, amd_id, sizeof(amd_id) - 1) == 0 || memcmp(v, hygon_id, sizeof(hygon_id) - 1) == 0; - do_cpuid(1, p); - cpu_id = p[0]; - if (cpu_feature != 0) { do_cpuid(0x80000000, p); cpu_exthigh = p[0];