4 files changed, 39 insertions, 38 deletions

diff --git a/sys/amd64/linux/linux_machdep.c b/sys/amd64/linux/linux_machdep.c
index d2f9d0cacd3c..b54674e793c8 100644
--- a/sys/amd64/linux/linux_machdep.c
+++ b/sys/amd64/linux/linux_machdep.c
@@ -79,6 +79,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_map.h>
 
 #include <x86/ifunc.h>
+#include <x86/reg.h>
 #include <x86/sysarch.h>
 
 #include <security/audit/audit.h>
@@ -347,3 +348,36 @@ DEFINE_IFUNC(, int, futex_xorl, (int, uint32_t *, int *))
 	return ((cpu_stdext_feature & CPUID_STDEXT_SMAP) != 0 ?
 	    futex_xorl_smap : futex_xorl_nosmap);
 }
+
+void
+bsd_to_linux_regset(struct reg *b_reg, struct linux_pt_regset *l_regset)
+{
+
+	l_regset->r15 = b_reg->r_r15;
+	l_regset->r14 = b_reg->r_r14;
+	l_regset->r13 = b_reg->r_r13;
+	l_regset->r12 = b_reg->r_r12;
+	l_regset->rbp = b_reg->r_rbp;
+	l_regset->rbx = b_reg->r_rbx;
+	l_regset->r11 = b_reg->r_r11;
+	l_regset->r10 = b_reg->r_r10;
+	l_regset->r9 = b_reg->r_r9;
+	l_regset->r8 = b_reg->r_r8;
+	l_regset->rax = b_reg->r_rax;
+	l_regset->rcx = b_reg->r_rcx;
+	l_regset->rdx = b_reg->r_rdx;
+	l_regset->rsi = b_reg->r_rsi;
+	l_regset->rdi = b_reg->r_rdi;
+	l_regset->orig_rax = b_reg->r_rax;
+	l_regset->rip = b_reg->r_rip;
+	l_regset->cs = b_reg->r_cs;
+	l_regset->eflags = b_reg->r_rflags;
+	l_regset->rsp = b_reg->r_rsp;
+	l_regset->ss = b_reg->r_ss;
+	l_regset->fs_base = 0;
+	l_regset->gs_base = 0;
+	l_regset->ds = b_reg->r_ds;
+	l_regset->es = b_reg->r_es;
+	l_regset->fs = b_reg->r_fs;
+	l_regset->gs = b_reg->r_gs;
+}
diff --git a/sys/amd64/linux/linux_ptrace.c b/sys/amd64/linux/linux_ptrace.c
index 67d8b121fbf1..9386ba1e6ae3 100644
--- a/sys/amd64/linux/linux_ptrace.c
+++ b/sys/amd64/linux/linux_ptrace.c
@@ -205,39 +205,6 @@ map_regs_to_linux(struct reg *b_reg, struct linux_pt_reg *l_reg)
 	l_reg->ss = b_reg->r_ss;
 }
 
-void
-bsd_to_linux_regset(struct reg *b_reg, struct linux_pt_regset *l_regset)
-{
-
-	l_regset->r15 = b_reg->r_r15;
-	l_regset->r14 = b_reg->r_r14;
-	l_regset->r13 = b_reg->r_r13;
-	l_regset->r12 = b_reg->r_r12;
-	l_regset->rbp = b_reg->r_rbp;
-	l_regset->rbx = b_reg->r_rbx;
-	l_regset->r11 = b_reg->r_r11;
-	l_regset->r10 = b_reg->r_r10;
-	l_regset->r9 = b_reg->r_r9;
-	l_regset->r8 = b_reg->r_r8;
-	l_regset->rax = b_reg->r_rax;
-	l_regset->rcx = b_reg->r_rcx;
-	l_regset->rdx = b_reg->r_rdx;
-	l_regset->rsi = b_reg->r_rsi;
-	l_regset->rdi = b_reg->r_rdi;
-	l_regset->orig_rax = b_reg->r_rax;
-	l_regset->rip = b_reg->r_rip;
-	l_regset->cs = b_reg->r_cs;
-	l_regset->eflags = b_reg->r_rflags;
-	l_regset->rsp = b_reg->r_rsp;
-	l_regset->ss = b_reg->r_ss;
-	l_regset->fs_base = 0;
-	l_regset->gs_base = 0;
-	l_regset->ds = b_reg->r_ds;
-	l_regset->es = b_reg->r_es;
-	l_regset->fs = b_reg->r_fs;
-	l_regset->gs = b_reg->r_gs;
-}
-
 static void
 map_regs_from_linux(struct reg *b_reg, struct linux_pt_reg *l_reg)
 {
diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c
index 655214b10047..c5538932b1e3 100644
--- a/sys/amd64/linux/linux_sysvec.c
+++ b/sys/amd64/linux/linux_sysvec.c
@@ -741,8 +741,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 = FREEBSD_ABI_VENDOR,
-	.sv_elf_core_prepare_notes = elf64_prepare_notes,
+	.sv_elf_core_abi_vendor = LINUX_ABI_VENDOR,
+	.sv_elf_core_prepare_notes = linux64_prepare_notes,
 	.sv_imgact_try	= linux_exec_imgact_try,
 	.sv_minsigstksz	= LINUX_MINSIGSTKSZ,
 	.sv_minuser	= VM_MIN_ADDRESS,
diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c
index 740e8a54a4da..504d57e418a5 100644
--- a/sys/amd64/linux32/linux32_sysvec.c
+++ b/sys/amd64/linux32/linux32_sysvec.c
@@ -912,9 +912,9 @@ struct sysentvec elf_linux_sysvec = {
 	.sv_szsigcode	= &linux_szsigcode,
 	.sv_name	= "Linux ELF32",
 	.sv_coredump	= elf32_coredump,
-	.sv_elf_core_osabi = ELFOSABI_FREEBSD,
-	.sv_elf_core_abi_vendor = FREEBSD_ABI_VENDOR,
-	.sv_elf_core_prepare_notes = elf32_prepare_notes,
+	.sv_elf_core_osabi = ELFOSABI_NONE,
+	.sv_elf_core_abi_vendor = LINUX_ABI_VENDOR,
+	.sv_elf_core_prepare_notes = linux32_prepare_notes,
 	.sv_imgact_try	= linux_exec_imgact_try,
 	.sv_minsigstksz	= LINUX_MINSIGSTKSZ,
 	.sv_minuser	= VM_MIN_ADDRESS,