From nobody Mon Jul 21 14:58:13 2025 X-Original-To: dev-commits-src-main@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 4bm3Rp2xxKz62lGj; Mon, 21 Jul 2025 14:58:14 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bm3Rp0FKLz3P56; Mon, 21 Jul 2025 14:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753109894; 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=J+6GMn2ScyUVcUyQTzRwWWgqyFMvoot7VFbWs5xzi8M=; b=ZYTYUf5C4Ti2bIM5/pQor0kPj+dpdmwvVctI61HIGk4yIR7z7EWT/2BBzqvAQ65yDWlsp/ A5HO4a6WjOe2IcyoV8yhLZrz8T+R15/SR8bWArhbPE2lraRgYUDbhGS5dnM5gpMy1CK552 Z2G6Kjal53LH7DdFI1kPoQJQ9WTNt/zLZHw9kXxY7TXoVcAmXuNQChJIiqG0fAZUssVvSv CsnQ3VSIouwVckqXf37IUFN5LE/RmZpY54ZGXo0pGqjldp63wL+dYDrLqP9u9M0cRRhiBz JbcYqMRHcytK8mi8NoOAXe5ZXXJIPie4omxJg4olgqstBDuJDaM0jfJIvuDEvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753109894; 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=J+6GMn2ScyUVcUyQTzRwWWgqyFMvoot7VFbWs5xzi8M=; b=uNaOc/0n07CXV1LWZKtEnB5miz9xpsbnYipwgj0Fx45rHc09JiIeGie1mukd2P1pA0qlHw ExMlRlYGiVfAPHLYgW5sY843nYV1OcqFYkMYiG8PLuOt8sO+mS2he0O3is4NJY7ECfTAPu 3sg+HTMcO82+KMBCM6924528U8xzgLMq1plLBYXkmVCs3i4Sp4kkFLckcC7f6KQQ0avW37 dZxZIFDgug1NRZb0PE+JPrvpTBSDYDsfgwRkrXNBRX7Isnxd9QUw/ncW3ubqbsaLq5tcNx dFyWCcUBP6156Lf+iU0KxU5P5G5fTjXZ/L5yhRMggpcTMbg6kkGQHrSLDE3zAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753109894; a=rsa-sha256; cv=none; b=NzKpr+cHTh0m1BTAg4uAXxZXtT3mM2sfWHpSavY/F57QeGWJO/bOnlqc3DLfnkrra84V1j cdvftHvJbW1XJY8+93hJ08dtFqrEa0KzcTx+Mzj4fuJP8wks5bLU5x80k+0avzEq0/rq8x eK4W0eFhUnRHYoKVVI999WEz048CboH6sI+HsfKTGbjFdndy7n84lfefgnOWesbHtXSJHZ mBJZpxUNmQ0Tpoj9QfehGbWZ+HdzynY/cnCVwDUxspSVZjLV5fGRmwPSGjDQzIPSJMDrnQ rNGQe5OzSgrmu1S0V/lAX0Kofh2oHP/je70LV2BcJSUr8HxTLSOhH2USNv/41A== 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 4bm3Rn6ybQz12Yx; Mon, 21 Jul 2025 14:58:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56LEwDM3053786; Mon, 21 Jul 2025 14:58:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56LEwD36053783; Mon, 21 Jul 2025 14:58:13 GMT (envelope-from git) Date: Mon, 21 Jul 2025 14:58:13 GMT Message-Id: <202507211458.56LEwD36053783@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: cc21f6e53f43 - main - amd64: Make a comment less confusing List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: cc21f6e53f43f0e4c082222460d90ea581f3e2d6 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cc21f6e53f43f0e4c082222460d90ea581f3e2d6 commit cc21f6e53f43f0e4c082222460d90ea581f3e2d6 Author: Mark Johnston AuthorDate: 2025-07-21 13:33:31 +0000 Commit: Mark Johnston CommitDate: 2025-07-21 14:57:58 +0000 amd64: Make a comment less confusing Also merge two printf()s. No functional change intended. Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51452 --- sys/amd64/amd64/trap.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index d9a5f7096a6e..f3469ed5e2bc 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -37,7 +37,6 @@ * SUCH DAMAGE. */ -#include /* * AMD64 Trap and System call handling */ @@ -898,9 +897,9 @@ trap_diag(struct trapframe *frame, vm_offset_t eva) printf("\n\nFatal trap %d: %s while in %s mode\n", type, type < nitems(trap_msg) ? trap_msg[type] : UNKNOWN, TRAPF_USERMODE(frame) ? "user" : "kernel"); - /* two separate prints in case of a trap on an unmapped page */ - printf("cpuid = %d; ", PCPU_GET(cpuid)); - printf("apic id = %02x\n", PCPU_GET(apic_id)); + /* Print these separately in case pcpu accesses trap. */ + printf("cpuid = %d; apic id = %02x\n", PCPU_GET(cpuid), + PCPU_GET(apic_id)); if (type == T_PAGEFLT) { printf("fault virtual address = 0x%lx\n", eva); printf("fault code = %s %s %s%s%s, %s\n", @@ -1021,9 +1020,9 @@ dblfault_handler(struct trapframe *frame) frame->tf_cs, frame->tf_ss, frame->tf_ds, frame->tf_es, frame->tf_fs, frame->tf_gs, rdmsr(MSR_FSBASE), rdmsr(MSR_GSBASE), rdmsr(MSR_KGSBASE)); - /* two separate prints in case of a trap on an unmapped page */ - printf("cpuid = %d; ", PCPU_GET(cpuid)); - printf("apic id = %02x\n", PCPU_GET(apic_id)); + /* Print these separately in case pcpu accesses trap. */ + printf("cpuid = %d; apic id = %02x\n", PCPU_GET(cpuid), + PCPU_GET(apic_id)); panic("double fault"); }