From nobody Fri Jun 17 19:36:47 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 70E1985A2CF; Fri, 17 Jun 2022 19:36:48 +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 4LPq6m1YyYz3P4q; Fri, 17 Jun 2022 19:36:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494608; 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=Tn1yr5cTJ1r/CEy7bZwjSWjNWDHxryQeE2442NQzijk=; b=QI8nc2DnQuuwtkTRPdZahRdgVCM/tjjg7CAVgh1zeJiXNAeNELVGRNSdaJpHy+cvd8LGgo 0YillB8jCTNmyrccZ2sVeMHNAvC3csHTUCs7O3mYh7NwmZnoLJnLZwgjr5Tbpjg9ImV3hc Hi/kFgowBim4tzQXU7VLoF28D8PlzhMQHRI2Cjd5xi28Bu0/qb/T8tQEdxWGtKTWbbgfwl gcZX1/shuONV/EybnqqYLrT6pCOtH034oAGdofmpNu7MURQkPOD8vTrgouO97O29VFtv6U Z94SSTsZ5F96vVZaFljWgXN/vU7WC5u5tOddPTvZQhTYYUdLxmvZD3BwwGIryw== 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 1526A25579; Fri, 17 Jun 2022 19:36:48 +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 25HJalxa012504; Fri, 17 Jun 2022 19:36:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJal14012503; Fri, 17 Jun 2022 19:36:47 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:36:47 GMT Message-Id: <202206171936.25HJal14012503@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: ab3423fdb7fd - stable/13 - linux(4): revert arm64 part of 447636e43c0 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ab3423fdb7fdf4c47fe5994b21b89b4d34a2e184 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494608; 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=Tn1yr5cTJ1r/CEy7bZwjSWjNWDHxryQeE2442NQzijk=; b=kEz0GbWmG/ryjDPe7gzj7VDb6uJXgZboHklMyoewf6+oSQh3Qikz+pcoG0b0Wbcvx+Y+Dh g/JyDv3ZlVGjcqULaPQdIBfW8btIgoSVrT9kxMSywKAjU+33N6HaGJmQAo0J1jKv8I8iXI SXZtm6sfR/hiD4m4onbp6KoEBDxlqvT38NhLe5L/0FvEovn+EnZFpkfSwBLboMGfpD2YDs cz3UqWDU4291MMnRL3ulECgCufakYbUPyy61312oocpdfU7/zPsaj3HTwnbiRCJ86NueKD 9qJhaXC9kaq5LL87t1fHSueafd1CTk3FinZnHRnm07O3ye1On7tjfNM08ohAcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494608; a=rsa-sha256; cv=none; b=aWlI1yjM3EMI67WYgrU7If2obKqu55Vho4TCbtenishm0MY/1I094tv4md9HucQgpVq/mj Kge+FO2pq8hB5KuFBIE9wwzNumHzepXPw1MUFRCo/oHdl3Rw2iR/iBczRf6E2hmaHfDs0x JqurjRDT03v5lj+nKtye8ZqL1ER6D2QoyMnihg5Jh6qixRuxg9y5GJNp0ALzi9y99Ix6sg BdipjDIuIeBjnF92vinY2ViGqTiVoOZgLSBJVI+P7mMzzeMP/zFcSWXdpZzzIxaLfRUUVe sO/+ExTvclnbzHefIxsylbKgEWd/vDvDRrby+SJGHzdweHYgqW9lInu5Nd3bYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=ab3423fdb7fdf4c47fe5994b21b89b4d34a2e184 commit ab3423fdb7fdf4c47fe5994b21b89b4d34a2e184 Author: Edward Tomasz Napierala AuthorDate: 2021-07-01 08:28:01 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:33:02 +0000 linux(4): revert arm64 part of 447636e43c0 The arm64 part of the patch was incomplete and prevented linux64.ko from loading due to missing symbol. Sponsored By: EPSRC (cherry picked from commit 93c3453f11c9bc99ae482565b3a3f29b39ab8f62) --- sys/arm64/linux/linux_sysvec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c index 1b815b8ac0f2..5a2edcefac2c 100644 --- a/sys/arm64/linux/linux_sysvec.c +++ b/sys/arm64/linux/linux_sysvec.c @@ -404,8 +404,8 @@ struct sysentvec elf_linux_sysvec = { .sv_name = "Linux ELF64", .sv_coredump = elf64_coredump, .sv_elf_core_osabi = ELFOSABI_NONE, - .sv_elf_core_abi_vendor = LINUX_ABI_VENDOR, - .sv_elf_core_prepare_notes = linux64_prepare_notes, + .sv_elf_core_abi_vendor = FREEBSD_ABI_VENDOR, + .sv_elf_core_prepare_notes = elf64_prepare_notes, .sv_imgact_try = linux_exec_imgact_try, .sv_minsigstksz = LINUX_MINSIGSTKSZ, .sv_minuser = VM_MIN_ADDRESS,