From nobody Sat Mar 19 00:31:20 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 CCBED1A29C20; Sat, 19 Mar 2022 00:31:20 +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 4KL1yc5NgDz3FHZ; Sat, 19 Mar 2022 00:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647649880; 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=MPZ0TbZSe37l61+Pc8bkRNsAPvFROT65yTzy8v0VWgI=; b=OQXm1FyBMrfQK7V/8TMBjdYeag9KLBFlQ6gAqqHJAve57kJF9BusQr5EZy9j3Jy4e6fEiz 2Ca11vsoMVtpK5d15knKxcd7+mLvThcYWVjTCKGt3wIO7FGWjIsppsm4iCwmzZFHCuCgbw ZpgPAzbDrP5TCKBjtsezefBzn+kHo5UwzV2M0OL9a+rlfC1E+D6coSjM+SopDQCk3ifzRW wA4m5JT5Zh3WeTOweqipkxSykv4NbMbJ/kKFpK6dHXdbVGB4/UipIRcNWVQiQJPm5CS9lq nmB9OPe/hoE0f8Z1ZGVQU3TWRLo4qLI97AcHepWh/TcKXSefJfVOvsGE5rG94g== 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 99D261280; Sat, 19 Mar 2022 00:31:20 +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 22J0VKUK006211; Sat, 19 Mar 2022 00:31:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22J0VKFA006210; Sat, 19 Mar 2022 00:31:20 GMT (envelope-from git) Date: Sat, 19 Mar 2022 00:31:20 GMT Message-Id: <202203190031.22J0VKFA006210@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: f877ca16c945 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: f877ca16c9457cb3611bbb53bf84b4859d0c07cc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647649880; 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=MPZ0TbZSe37l61+Pc8bkRNsAPvFROT65yTzy8v0VWgI=; b=AQFi5jhAb7DTCB/lGCj3vdgpu+SnQ3hrX7Q8g7ipd5uk0YLSsOg8QJwEVLaOWV/KzpU1ld TjHWHvEKx4q+Y9Lq6NFz+YZe4ASFdv+V5c7se7izeExl/Zg7DVATB/3ycE7s4xX7fWiRUu R8H0urwDa7J5hvq3IEqec5bNWJORbLQAInRQiIJFfrqMzmL+Xj/Vm47LLK9nwUqI0Vih45 1Tm0XYtGe6ozSLxqTzklyFO+WKS7pt6LcG0bcQQkhsoccafaVkgl6rV7PFe0j1wpdMayX6 o4kPBf1kBOJFgAlbX1d3UnqeVCTH64st4XFezwljD8rRW5x74Rzn1C9DekULpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647649880; a=rsa-sha256; cv=none; b=BXNlCM92+gTy0aQ3rGHUO8cvP2NhOvrN5YY3sPow7BcDfxJBQSv1/DB/pffTbcDe5wGLV8 i2PuYKzyqZ4uAtjZUHN4KN1sGw6z8n41m3clE9IhvS0hT+JNrZGx2Zq6BBomjRzcltKatl KNuFkjnXE+sIiR9cuCEFFdq/IrxgnrJzRYtte8rVsmo/hwT4H3/HTkJ+FLodOC+UzVnmrV 7/XpubNxQ81uz9qigvF82k1Hi5DuqcJJfUqahfwaNLFhHvtICOXOWpWDbYE5C5AzCIboZx Hdy0qzZ0SYyBZT2tu6cLYmGdeU8c90PqGZxvIUxppSuYWuuvCUtsEnY7iWw8Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f877ca16c9457cb3611bbb53bf84b4859d0c07cc commit f877ca16c9457cb3611bbb53bf84b4859d0c07cc Author: Zhenlei Huang AuthorDate: 2022-03-16 20:28:58 +0000 Commit: Ed Maste CommitDate: 2022-03-19 00:31:00 +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 64cf276614dc..4854331af17c 100644 --- a/sys/x86/x86/mp_x86.c +++ b/sys/x86/x86/mp_x86.c @@ -214,7 +214,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); }