From nobody Sun Jan 02 21:08:10 2022 X-Original-To: dev-commits-src-all@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 F25761920427; Sun, 2 Jan 2022 21:08:11 +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 4JRs0p3swYz3L7h; Sun, 2 Jan 2022 21:08:10 +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 382AB18EF1; Sun, 2 Jan 2022 21:08:10 +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 202L8Ave018237; Sun, 2 Jan 2022 21:08:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 202L8AmX018236; Sun, 2 Jan 2022 21:08:10 GMT (envelope-from git) Date: Sun, 2 Jan 2022 21:08:10 GMT Message-Id: <202201022108.202L8AmX018236@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 698727d63734 - main - Fix variable name: freq_khz -> freq List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 698727d637341f2306138ca0ea181444de3df479 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641157690; 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=UekA1DSBOgOOAWS7fS0HYd+OcpBMrjdS2LhiI7frubo=; b=CSy6II0tivJjSrCrqXF7EfYp/jYomRtxUYdsrCs2/Mc8ydhIQrBClkHW3f/wac4Ds93gun ojVFlram7Cc+0VRtmjXenAfjNMyqcUX0NnjTi+v0rtk4sidukTitzqVWup8QQb4Ng/t6pR HodYKaUlRq4uLbO+8bH0AMW1GSw/cAlxhwDy/jMJ18LIlj37w8E526dRjEBhA/SPZFgkls L8hgyhBhfyLWcNg0aiYL9NK4jU1oS91L0VgIs3C7izSmL2zzra91iIJfEcok4E94XDTJkF oE4tkzA5TFxXAy33SNKq7z2DFsiyWKVT/UY1XuZIJb6gt0eBIxuNfR5DTPBEUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641157690; a=rsa-sha256; cv=none; b=wG7gYmZG4nXX3C/A0O2j3LJa09A0u7gQTj8AcZ9oqc3mApZHzHpL/aaOM3oDgSpLxrtLUK Fu5o+N9EDUZJrzykaGL0qQ+5TkVmS6HxYMAA6YdvVhswctnHHS05GV054rp7FhxMOt4jRk 4WWehxUp/+9q5hW2VPRXUjjsdcEQ50up2zJ4iTXoOvxnd4pUC7Yp2m8j0Y6gbArzgeg/yh ufqz+2ilXz51VYj0m4VPHE2ftgC08hYHGpkyrxi2GTB1zJrLXv31abaxH1i6kN02JNm4ZB Bv6j53po5r7SYR9Z12rcXwK7GZ5y1igU8ZIa2wHHlh1A0TREqpKcvBZA066B0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=698727d637341f2306138ca0ea181444de3df479 commit 698727d637341f2306138ca0ea181444de3df479 Author: Colin Percival AuthorDate: 2021-12-30 19:47:50 +0000 Commit: Colin Percival CommitDate: 2022-01-02 21:07:53 +0000 Fix variable name: freq_khz -> freq An earlier version of this code computed the TSC frequency in kHz. When the code was changed to compute the frequency more accurately, the variable name was not updated. Reviewed by: markj Fixes: 22875f88799e x86: Implement deferred TSC calibration MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D33696 --- sys/x86/x86/tsc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/x86/x86/tsc.c b/sys/x86/x86/tsc.c index 534fdb5dd279..29da37ca6874 100644 --- a/sys/x86/x86/tsc.c +++ b/sys/x86/x86/tsc.c @@ -704,7 +704,7 @@ void tsc_calibrate(void) { struct timecounter *tc; - uint64_t freq_khz, tsc_start, tsc_end; + uint64_t freq, tsc_start, tsc_end; u_int t_start, t_end; register_t flags; int cpu; @@ -740,9 +740,9 @@ tsc_calibrate(void) t_end += (uint64_t)tc->tc_counter_mask + 1; } - freq_khz = tc->tc_frequency * (tsc_end - tsc_start) / (t_end - t_start); + freq = tc->tc_frequency * (tsc_end - tsc_start) / (t_end - t_start); - tsc_update_freq(freq_khz); + tsc_update_freq(freq); calibrated: tc_init(&tsc_timecounter); set_cputicker(rdtsc, tsc_freq, !tsc_is_invariant);