Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Jun 2022 19:36:47 GMT
From:      Dmitry Chagin <dchagin@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: ab3423fdb7fd - stable/13 - linux(4): revert arm64 part of 447636e43c0
Message-ID:  <202206171936.25HJal14012503@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by dchagin:

URL: https://cgit.FreeBSD.org/src/commit/?id=ab3423fdb7fdf4c47fe5994b21b89b4d34a2e184

commit ab3423fdb7fdf4c47fe5994b21b89b4d34a2e184
Author:     Edward Tomasz Napierala <trasz@FreeBSD.org>
AuthorDate: 2021-07-01 08:28:01 +0000
Commit:     Dmitry Chagin <dchagin@FreeBSD.org>
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,



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206171936.25HJal14012503>