From owner-dev-commits-src-branches@freebsd.org Fri Aug 6 12:51:23 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A7133655D92; Fri, 6 Aug 2021 12:51:23 +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 4Gh52M2nHSz4Z09; Fri, 6 Aug 2021 12:51:23 +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 187246149; Fri, 6 Aug 2021 12:51:23 +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 176CpMf6017251; Fri, 6 Aug 2021 12:51:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 176CpMAm017250; Fri, 6 Aug 2021 12:51:22 GMT (envelope-from git) Date: Fri, 6 Aug 2021 12:51:22 GMT Message-Id: <202108061251.176CpMAm017250@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 9408ee9e88ef - stable/13 - Remove the newline from arm64 trap panics MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9408ee9e88ef7505312d51ea9b431bc0b0bc2b61 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2021 12:51:24 -0000 The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=9408ee9e88ef7505312d51ea9b431bc0b0bc2b61 commit 9408ee9e88ef7505312d51ea9b431bc0b0bc2b61 Author: Andrew Turner AuthorDate: 2021-07-14 19:49:58 +0000 Commit: Andrew Turner CommitDate: 2021-08-05 20:50:22 +0000 Remove the newline from arm64 trap panics The panic function will already print a newline so there is no need to add it here. Sponsored by: The FreeBSD Foundation (cherry picked from commit 2665851086795c61e799fbe57bfb37cabab3cf8c) --- sys/arm64/arm64/trap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index cdb7ae8fadae..fa33f713a4fc 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -424,7 +424,7 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) #ifdef KDB kdb_trap(exception, 0, frame); #else - panic("No debugger in kernel.\n"); + panic("No debugger in kernel."); #endif break; case EXCP_WATCHPT_EL1: @@ -432,7 +432,7 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) #ifdef KDB kdb_trap(exception, 0, frame); #else - panic("No debugger in kernel.\n"); + panic("No debugger in kernel."); #endif break; case EXCP_UNKNOWN: @@ -442,7 +442,7 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) default: print_registers(frame); printf(" far: %16lx\n", READ_SPECIALREG(far_el1)); - panic("Unknown kernel exception %x esr_el1 %lx\n", exception, + panic("Unknown kernel exception %x esr_el1 %lx", exception, esr); } }