Module Name: src
Committed By: pgoyette
Date: Thu Jan 24 04:08:10 UTC 2019
Modified Files:
src/sys/arch/amd64/amd64 [pgoyette-compat]: netbsd32_machdep.c
src/sys/arch/mips/mips [pgoyette-compat]: netbsd32_machdep.c
src/sys/arch/sparc64/sparc64 [pgoyette-compat]: netbsd32_machdep.c
src/sys/compat/linux/common [pgoyette-compat]: linux_exec_elf32.c
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h netbsd32_mod.c
src/sys/kern [pgoyette-compat]: compat_stub.c
src/sys/sys [pgoyette-compat]: compat_stub.h
Log Message:
Rework placement of the new netbsd32_machine32_hook
To generate a diff of this commit:
cvs rdiff -u -r1.115.2.17 -r1.115.2.18 \
src/sys/arch/amd64/amd64/netbsd32_machdep.c
cvs rdiff -u -r1.15.2.13 -r1.15.2.14 \
src/sys/arch/mips/mips/netbsd32_machdep.c
cvs rdiff -u -r1.110.14.6 -r1.110.14.7 \
src/sys/arch/sparc64/sparc64/netbsd32_machdep.c
cvs rdiff -u -r1.94.12.2 -r1.94.12.3 \
src/sys/compat/linux/common/linux_exec_elf32.c
cvs rdiff -u -r1.116.2.17 -r1.116.2.18 src/sys/compat/netbsd32/netbsd32.h
cvs rdiff -u -r1.13.16.17 -r1.13.16.18 src/sys/compat/netbsd32/netbsd32_mod.c
cvs rdiff -u -r1.1.2.40 -r1.1.2.41 src/sys/kern/compat_stub.c
cvs rdiff -u -r1.1.2.53 -r1.1.2.54 src/sys/sys/compat_stub.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/netbsd32_machdep.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.17 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.18
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.17 Thu Jan 24 03:27:23 2019
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Thu Jan 24 04:08:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.115.2.17 2019/01/24 03:27:23 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.115.2.18 2019/01/24 04:08:09 pgoyette Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.115.2.17 2019/01/24 03:27:23 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.115.2.18 2019/01/24 04:08:09 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -969,6 +969,8 @@ netbsd32_vm_default_addr(struct proc *p,
return VM_DEFAULT_ADDRESS32_BOTTOMUP(base, sz);
}
+extern struct netbsd32_machine32_hook_t netbsd32_machine32_hook;
+
static const char *
netbsd32_machine32(void)
{
Index: src/sys/arch/mips/mips/netbsd32_machdep.c
diff -u src/sys/arch/mips/mips/netbsd32_machdep.c:1.15.2.13 src/sys/arch/mips/mips/netbsd32_machdep.c:1.15.2.14
--- src/sys/arch/mips/mips/netbsd32_machdep.c:1.15.2.13 Thu Jan 24 03:27:23 2019
+++ src/sys/arch/mips/mips/netbsd32_machdep.c Thu Jan 24 04:08:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.15.2.13 2019/01/24 03:27:23 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.15.2.14 2019/01/24 04:08:09 pgoyette Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.15.2.13 2019/01/24 03:27:23 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.15.2.14 2019/01/24 04:08:09 pgoyette Exp $");
#include "opt_compat_netbsd.h"
#include "opt_coredump.h"
@@ -308,6 +308,7 @@ cpu_coredump32(struct lwp *l, struct cor
#endif
struct netbsd32_sendsig_hook_t netbsd32_sendsig_hook;
+extern struct netbsd32_machine32_hook_t netbsd32_machine32_hook;
void
netbsd32_sendsig(const ksiginfo_t *ksi, const sigset_t *mask)
Index: src/sys/arch/sparc64/sparc64/netbsd32_machdep.c
diff -u src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.110.14.6 src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.110.14.7
--- src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.110.14.6 Thu Jan 24 03:27:24 2019
+++ src/sys/arch/sparc64/sparc64/netbsd32_machdep.c Thu Jan 24 04:08:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.110.14.6 2019/01/24 03:27:24 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.110.14.7 2019/01/24 04:08:09 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.110.14.6 2019/01/24 03:27:24 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.110.14.7 2019/01/24 04:08:09 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1023,6 +1023,8 @@ netbsd32_machine32(void)
return machine32;
}
+extern struct netbsd32_machine32_hook_t netbsd32_machine32_hook;
+
void
netbsd32_machdep_md_init(void)
{
Index: src/sys/compat/linux/common/linux_exec_elf32.c
diff -u src/sys/compat/linux/common/linux_exec_elf32.c:1.94.12.2 src/sys/compat/linux/common/linux_exec_elf32.c:1.94.12.3
--- src/sys/compat/linux/common/linux_exec_elf32.c:1.94.12.2 Thu Jan 24 03:27:24 2019
+++ src/sys/compat/linux/common/linux_exec_elf32.c Thu Jan 24 04:08:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_exec_elf32.c,v 1.94.12.2 2019/01/24 03:27:24 pgoyette Exp $ */
+/* $NetBSD: linux_exec_elf32.c,v 1.94.12.3 2019/01/24 04:08:09 pgoyette Exp $ */
/*-
* Copyright (c) 1995, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_exec_elf32.c,v 1.94.12.2 2019/01/24 03:27:24 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_exec_elf32.c,v 1.94.12.3 2019/01/24 04:08:09 pgoyette Exp $");
#ifndef ELFSIZE
/* XXX should die */
@@ -335,7 +335,7 @@ ELFNAME2(linux,go_rt0_signature)(struct
goto out;
#if (ELFSIZE == 32)
- MODULE_HOOK_CALL(netbsd32_machine32_hook, (), machine, m);
+ MODULE_CALL_HOOK(netbsd32_machine32_hook, (), machine, m);
#else
m = machine;
#endif
Index: src/sys/compat/netbsd32/netbsd32.h
diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.17 src/sys/compat/netbsd32/netbsd32.h:1.116.2.18
--- src/sys/compat/netbsd32/netbsd32.h:1.116.2.17 Mon Jan 14 13:34:27 2019
+++ src/sys/compat/netbsd32/netbsd32.h Thu Jan 24 04:08:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.116.2.17 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: netbsd32.h,v 1.116.2.18 2019/01/24 04:08:09 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green
@@ -1177,6 +1177,8 @@ SYSCTL_SETUP_PROTO(netbsd32_sysctl_emul_
MODULE_HOOK(netbsd32_sendsig_hook, void,
(const ksiginfo_t *, const sigset_t *));
+MODULE_HOOK(netbsd32_machine32_hook, const char *, (void));
+
extern struct sysent netbsd32_sysent[];
extern const uint32_t netbsd32_sysent_nomodbits[];
#ifdef SYSCALL_DEBUG
Index: src/sys/compat/netbsd32/netbsd32_mod.c
diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.17 src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.18
--- src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.17 Wed Dec 26 14:01:46 2018
+++ src/sys/compat/netbsd32/netbsd32_mod.c Thu Jan 24 04:08:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_mod.c,v 1.13.16.17 2018/12/26 14:01:46 pgoyette Exp $ */
+/* $NetBSD: netbsd32_mod.c,v 1.13.16.18 2019/01/24 04:08:09 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.17 2018/12/26 14:01:46 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.18 2019/01/24 04:08:09 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_execfmt.h"
@@ -54,6 +54,8 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mod
sizeof(Elf32_Addr)) + MAXPATHLEN + ALIGN(1))
struct compat32_80_modctl_hook_t compat32_80_modctl_hook;
+struct netbsd32_machine32_hook_t netbsd32_machine32_hook;
+
# define DEPS1 "ksem,coredump,compat_util"
Index: src/sys/kern/compat_stub.c
diff -u src/sys/kern/compat_stub.c:1.1.2.40 src/sys/kern/compat_stub.c:1.1.2.41
--- src/sys/kern/compat_stub.c:1.1.2.40 Thu Jan 24 03:27:24 2019
+++ src/sys/kern/compat_stub.c Thu Jan 24 04:08:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_stub.c,v 1.1.2.40 2019/01/24 03:27:24 pgoyette Exp $ */
+/* $NetBSD: compat_stub.c,v 1.1.2.41 2019/01/24 04:08:09 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -247,8 +247,3 @@ struct compat_70_unp_hook_t compat_70_un
* Hook for sysvipc50_sysctl
*/
struct sysvipc50_sysctl_hook_t sysvipc50_sysctl_hook;
-
-/*
- * Hook for compat32_machine32
- */
-struct netbsd32_machine32_hook_t netbsd32_machine32_hook;
Index: src/sys/sys/compat_stub.h
diff -u src/sys/sys/compat_stub.h:1.1.2.53 src/sys/sys/compat_stub.h:1.1.2.54
--- src/sys/sys/compat_stub.h:1.1.2.53 Thu Jan 24 03:27:24 2019
+++ src/sys/sys/compat_stub.h Thu Jan 24 04:08:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_stub.h,v 1.1.2.53 2019/01/24 03:27:24 pgoyette Exp $ */
+/* $NetBSD: compat_stub.h,v 1.1.2.54 2019/01/24 04:08:09 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -308,9 +308,4 @@ MODULE_HOOK(compat_70_unp_hook, struct m
#include <sys/sysctl.h>
MODULE_HOOK(sysvipc50_sysctl_hook, int, (SYSCTLFN_PROTO));
-/*
- * Hook for compat32_machine32
- */
-MODULE_HOOK(netbsd32_machine32_hook, const char *, (void));
-
#endif /* _SYS_COMPAT_STUB_H */
