From nobody Sat Mar 19 00:31:44 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 4BFFB1A29A7A; Sat, 19 Mar 2022 00:31:45 +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 4KL1z46vw7z3FgH; Sat, 19 Mar 2022 00:31:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647649905; 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=pc/0dCD6O8m/62MALGmYjaEWqHXV9LUR922I/l1c78A=; b=KFBndbJJrkTTQEuM/097LSlU6qiOUnPuHf+KQf2b2dwIFVDPENPcbN837SCjb9mGGwnACp Toa/BVqGo+GfGCHjJfnIQXbJ82scsDYLDE9YMPr3Y/sg6+djcg6dxzxSjWznlygPFNVVud hoDd9EqRMTQzFZ0qiuNArZjgzDPGijRQUeqgmRaWFkXvedjd1W2oJRPL8a9CkT804Wx/oe 0YuLZjW8x6si8ocFPxUwdsz8D59j4rLcwrnuQ11gs7pJ3nZnbgD88Hjv+2OdP4msjzkcWP ejT1At/dq79aGTZWDbq3z5v41avTBON+jzbsJa1ceMOyhRA6Shq7nlB7lyyRrw== 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 CD7A9DDF; Sat, 19 Mar 2022 00:31:44 +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 22J0ViWO006371; Sat, 19 Mar 2022 00:31:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22J0ViGP006370; Sat, 19 Mar 2022 00:31:44 GMT (envelope-from git) Date: Sat, 19 Mar 2022 00:31:44 GMT Message-Id: <202203190031.22J0ViGP006370@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: c457983b9613 - stable/12 - x86: Correctly report unexpected cache level 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: c457983b9613de2c808bc1157c35e0d7e2305aee Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647649905; 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=pc/0dCD6O8m/62MALGmYjaEWqHXV9LUR922I/l1c78A=; b=D7H/GSB8r1nlF5eAkyRaIX+qBwt9xMhABQ/ciBLKgiIDJXBjlacquS6q1nsLKBWl1MxHm8 A/i7GxKZQfk+Biud9ezwqHxVC/5OfFVgWU3OvJj2ZEbZBWZDJKgfOwgc6O9sZKsqVLb8+S qCgqvDNoHm6qx7rX0Op9u9ZQJkts75h7v/0zr63ksVJGmIUykHrN5qbvNSae43rLox2jzf YrARyAv8avHa3NEbqF/YUHGkHSN+pMpjUyhRpyWO4d27PEaOChcBtreMP8OV8AWPewZOOB e/26DJCAAUoGu0cAJCufUix7nVxfS0vLhO+o+Q33sedNLyrjTTle6TvRsywLiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647649905; a=rsa-sha256; cv=none; b=rX6e4M9DcUvMawlBMA54qo6K0vcuzgptWl4phDaWDNWFluSrIV4trrePHxJ+LcTN1qIVVy pjnoykLfVWIvAIh8dO7wqXLuaxi7uCB0JaT0hIlwPWRARlg00Saiu58Tmna7TSDtcLqUTN xEmFBMZGNwhVD4t3R/BGPYvyPy9G5WCuiQpeTnu67W20pG/3/lKQ1+gloJenUtSD3gAOwy HfeS0hyGPddhTRt+90z9qY8L4tPRZsLl3I4HuN/W98Lh0+yu7+44qQro4jGOjiLB8VPD+M izJqWeZKu1dT0wIRpgqkxYn0+/mMqGVnf3SYzuSEqX4wo1yglVt99CH9XeAk9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c457983b9613de2c808bc1157c35e0d7e2305aee commit c457983b9613de2c808bc1157c35e0d7e2305aee Author: Zhenlei Huang AuthorDate: 2022-03-16 20:28:58 +0000 Commit: Ed Maste CommitDate: 2022-03-19 00:31:29 +0000 x86: Correctly report unexpected cache level Reviewed by: rpokala, emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D34577 (cherry picked from commit ba46c6c4b7fa76d9283294cb6d9ebadbd95f67ca) --- sys/x86/x86/mp_x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/x86/x86/mp_x86.c b/sys/x86/x86/mp_x86.c index 57cea8c7a07a..55fe86a03089 100644 --- a/sys/x86/x86/mp_x86.c +++ b/sys/x86/x86/mp_x86.c @@ -200,7 +200,7 @@ add_deterministic_cache(int type, int level, int share_count) if (type == 2) /* ignore instruction cache */ return (1); if (level == 0 || level > MAX_CACHE_LEVELS) { - printf("unexpected cache level %d\n", type); + printf("unexpected cache level %d\n", level); return (1); }