From owner-dev-commits-src-branches@freebsd.org Mon Jun 7 00:41:36 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 ED35A643AE6; Mon, 7 Jun 2021 00:41:36 +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 4Fyvh06RzWz4rjK; Mon, 7 Jun 2021 00:41:36 +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 C61DD5723; Mon, 7 Jun 2021 00:41:36 +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 1570fa71071212; Mon, 7 Jun 2021 00:41:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1570faLK071211; Mon, 7 Jun 2021 00:41:36 GMT (envelope-from git) Date: Mon, 7 Jun 2021 00:41:36 GMT Message-Id: <202106070041.1570faLK071211@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: b556a0eebf4d - stable/13 - arm64: correct END() copy-pasteo for generic_bs_fault 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: b556a0eebf4dd3179d744acdab276f77f61da30f 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: Mon, 07 Jun 2021 00:41:37 -0000 The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b556a0eebf4dd3179d744acdab276f77f61da30f commit b556a0eebf4dd3179d744acdab276f77f61da30f Author: Ed Maste AuthorDate: 2021-05-28 00:10:26 +0000 Commit: Ed Maste CommitDate: 2021-06-07 00:41:17 +0000 arm64: correct END() copy-pasteo for generic_bs_fault PR: 256197 Reported by: Nick Reilly MFC after: 1 week Fixes: 95a85c125d0e67 ("Add NetBSD compatible bus_space...") Sponsored by: The FreeBSD Foundation (cherry picked from commit d097687b315671191b16494c938d3ceecd3eca4f) --- sys/arm64/arm64/bus_space_asm.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/bus_space_asm.S b/sys/arm64/arm64/bus_space_asm.S index 53e104c7fb4f..1fac678df971 100644 --- a/sys/arm64/arm64/bus_space_asm.S +++ b/sys/arm64/arm64/bus_space_asm.S @@ -400,7 +400,7 @@ END(generic_bs_wr_8) ENTRY(generic_bs_fault) mov x0, #-1 ret -END(bus_fault) +END(generic_bs_fault) ENTRY(generic_bs_peek_1) .globl generic_bs_peek_1f