From nobody Thu Jan 06 14:08:43 2022 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 13077193C3ED; Thu, 6 Jan 2022 14:08:44 +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 4JV7Vz5VVgz4qpc; Thu, 6 Jan 2022 14:08:43 +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 9C60D20F68; Thu, 6 Jan 2022 14:08:43 +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 206E8hHS052832; Thu, 6 Jan 2022 14:08:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 206E8hkE052831; Thu, 6 Jan 2022 14:08:43 GMT (envelope-from git) Date: Thu, 6 Jan 2022 14:08:43 GMT Message-Id: <202201061408.206E8hkE052831@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 302738e4ff49 - stable/13 - x86: Fix up the MFC of 08161fd3b207105847bdd1dd8729ea4cbda6e537 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 302738e4ff4913e8941441d57498cce995fd1181 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641478123; 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=6s3VGx3+oGggss9KAjlSoCKkyNdGKgDn+/Fs9GfEg3k=; b=LRJ+Nj7DiE521L96QbUFmfZSXz5DWPg0ho5/q4yHeUwpTC/KYC4jxRX89BB14FH9XV0dnR tdRaJVn7S3E+4lWNOsDPB7pJu/39EU55Krb30mq0i8lXCroxQ/whj/L2xh1EJAif6Z+ZRO ROoZtXFipA3Hk+0/xPQd9ldPldaaCIlzAOuRZrLSZnPnB9fZoadtQ+08LBMxEqaHhn7Ef/ Rp0DUWD3fhvKUS6LJB0+54co1sqjV3DD49AYeAezm5Jy7xSGM5HS4fc9wBXNyb2UzwefFZ tBQgJveEZMFmnk2UnJWdTAzzlz7SMJImDb4u3aZV7GzrUdQ94Z9ncS+LDIBzPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641478123; a=rsa-sha256; cv=none; b=b/1u+DBzoTJIZjCOQOXbpoZExsc4uBhQnmPZf1QahFzukFFfAUd1R4ExsuZ9boAuJszGNC qgeg95cHRYpSCz8xcL92mKVdQW/f9vKf87uBjWc8cN6S8AxB0FmAaN+crENOJcggNcO7VL U2mmSg4bjasOymHl0RPwVtFr5fnoRpfabJo5SE6ok10Aq7IkE65Ct2u+ltlCIYbafxc3DM q9KVeALbAM8hL6DGZMBa1LW0/QvUO/gs4LAO6q/5FfGj1OWFtrVszgES+IobUtWwAZdIHL UOdeRTtYIUSsXYbw6GMWULjJtse91Je+f9vMnh6p3CBM2zoshaH9ac75JRr96A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=302738e4ff4913e8941441d57498cce995fd1181 commit 302738e4ff4913e8941441d57498cce995fd1181 Author: Mark Johnston AuthorDate: 2022-01-06 14:07:45 +0000 Commit: Mark Johnston CommitDate: 2022-01-06 14:07:45 +0000 x86: Fix up the MFC of 08161fd3b207105847bdd1dd8729ea4cbda6e537 This is a direct commit to stable/13. --- sys/x86/x86/tsc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/x86/x86/tsc.c b/sys/x86/x86/tsc.c index 6f0ef697cb2f..3a1377ff4277 100644 --- a/sys/x86/x86/tsc.c +++ b/sys/x86/x86/tsc.c @@ -744,6 +744,7 @@ tsc_calibrate(void) freq_khz = tc->tc_frequency * (tsc_end - tsc_start) / (t_end - t_start); tsc_update_freq(freq_khz); +calibrated: tc_init(&tsc_timecounter); set_cputicker(rdtsc, tsc_freq, !tsc_is_invariant); }