Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/pgoyette-compat]: src/sys/compat/netbsd32 Put the ``extern struct emul''...
details: https://anonhg.NetBSD.org/src/rev/2ca2227c8d39
branches: pgoyette-compat
changeset: 830667:2ca2227c8d39
user: pgoyette <pgoyette%NetBSD.org@localhost>
date: Tue Sep 11 21:18:32 2018 +0000
description:
Put the ``extern struct emul'' into the netbsd32_netbsd.h header
so it doesn't have to be separately declared in each source file.
Thanks mrg@
diffstat:
sys/compat/netbsd32/netbsd32.h | 10 +++++++++-
sys/compat/netbsd32/netbsd32_compat_09.c | 6 ++----
sys/compat/netbsd32/netbsd32_compat_12.c | 6 ++----
sys/compat/netbsd32/netbsd32_compat_13.c | 6 ++----
sys/compat/netbsd32/netbsd32_compat_20.c | 6 ++----
sys/compat/netbsd32/netbsd32_compat_30.c | 6 ++----
sys/compat/netbsd32/netbsd32_compat_43.c | 6 ++----
sys/compat/netbsd32/netbsd32_compat_50.c | 6 ++----
sys/compat/netbsd32/netbsd32_compat_60.c | 6 ++----
sys/compat/netbsd32/netbsd32_exec.h | 4 +---
sys/compat/netbsd32/netbsd32_ipc.c | 6 ++----
sys/compat/netbsd32/netbsd32_mqueue.c | 6 ++----
sys/compat/netbsd32/netbsd32_nfssvc.c | 6 ++----
sys/compat/netbsd32/netbsd32_ptrace.c | 7 ++-----
14 files changed, 34 insertions(+), 53 deletions(-)
diffs (truncated from 365 to 300 lines):
diff -r 5fc6b417f02c -r 2ca2227c8d39 sys/compat/netbsd32/netbsd32.h
--- a/sys/compat/netbsd32/netbsd32.h Tue Sep 11 09:22:51 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32.h Tue Sep 11 21:18:32 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.116.2.3 2018/09/06 06:55:46 pgoyette Exp $ */
+/* $NetBSD: netbsd32.h,v 1.116.2.4 2018/09/11 21:18:32 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green
@@ -1164,4 +1164,12 @@
#ifdef SYSCTL_SETUP_PROTO
SYSCTL_SETUP_PROTO(netbsd32_sysctl_emul_setup);
#endif /* SYSCTL_SETUP_PROTO */
+
+/*
+ * Finally, declare emul_netbsd32 as this is needed in lots of
+ * places when calling syscall_{,dis}establish()
+ */
+
+extern struct emul emul_netbsd32;
+
#endif /* _COMPAT_NETBSD32_NETBSD32_H_ */
diff -r 5fc6b417f02c -r 2ca2227c8d39 sys/compat/netbsd32/netbsd32_compat_09.c
--- a/sys/compat/netbsd32/netbsd32_compat_09.c Tue Sep 11 09:22:51 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_09.c Tue Sep 11 21:18:32 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_09.c,v 1.18.86.4 2018/09/11 05:00:42 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_09.c,v 1.18.86.5 2018/09/11 21:18:32 pgoyette Exp $ */
/*
* Copyright (c) 1998 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.18.86.4 2018/09/11 05:00:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.18.86.5 2018/09/11 21:18:32 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,8 +46,6 @@
#include <compat/netbsd32/netbsd32_syscall.h>
#include <compat/netbsd32/netbsd32_syscallargs.h>
-extern struct emul emul_netbsd32;
-
int
compat_09_netbsd32_ogetdomainname(struct lwp *l, const struct compat_09_netbsd32_ogetdomainname_args *uap, register_t *retval)
{
diff -r 5fc6b417f02c -r 2ca2227c8d39 sys/compat/netbsd32/netbsd32_compat_12.c
--- a/sys/compat/netbsd32/netbsd32_compat_12.c Tue Sep 11 09:22:51 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_12.c Tue Sep 11 21:18:32 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.6 2018/09/11 05:00:42 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.7 2018/09/11 21:18:32 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.6 2018/09/11 05:00:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.7 2018/09/11 21:18:32 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -54,8 +54,6 @@
#include <compat/netbsd32/netbsd32_syscall.h>
#include <compat/netbsd32/netbsd32_syscallargs.h>
-extern struct emul emul_netbsd32;
-
static void netbsd32_stat12_to_netbsd32(struct stat12 *,
struct netbsd32_stat12 *);
diff -r 5fc6b417f02c -r 2ca2227c8d39 sys/compat/netbsd32/netbsd32_compat_13.c
--- a/sys/compat/netbsd32/netbsd32_compat_13.c Tue Sep 11 09:22:51 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_13.c Tue Sep 11 21:18:32 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_13.c,v 1.26.28.5 2018/09/11 05:00:42 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_13.c,v 1.26.28.6 2018/09/11 21:18:32 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_13.c,v 1.26.28.5 2018/09/11 05:00:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_13.c,v 1.26.28.6 2018/09/11 21:18:32 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,8 +49,6 @@
#include <compat/common/compat_sigaltstack.h>
-extern struct emul emul_netbsd32;
-
int
compat_13_netbsd32_sigaltstack13(struct lwp *l, const struct compat_13_netbsd32_sigaltstack13_args *uap, register_t *retval)
{
diff -r 5fc6b417f02c -r 2ca2227c8d39 sys/compat/netbsd32/netbsd32_compat_20.c
--- a/sys/compat/netbsd32/netbsd32_compat_20.c Tue Sep 11 09:22:51 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_20.c Tue Sep 11 21:18:32 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_20.c,v 1.36.10.7 2018/09/11 05:00:42 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_20.c,v 1.36.10.8 2018/09/11 21:18:32 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.36.10.7 2018/09/11 05:00:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.36.10.8 2018/09/11 21:18:32 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,8 +51,6 @@
#include <compat/netbsd32/netbsd32_syscallargs.h>
#include <compat/netbsd32/netbsd32_conv.h>
-extern struct emul emul_netbsd32;
-
static inline void compat_20_netbsd32_from_statvfs(struct statvfs *,
struct netbsd32_statfs *);
diff -r 5fc6b417f02c -r 2ca2227c8d39 sys/compat/netbsd32/netbsd32_compat_30.c
--- a/sys/compat/netbsd32/netbsd32_compat_30.c Tue Sep 11 09:22:51 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_30.c Tue Sep 11 21:18:32 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_30.c,v 1.31.16.6 2018/09/11 05:00:42 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_30.c,v 1.31.16.7 2018/09/11 21:18:32 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.31.16.6 2018/09/11 05:00:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.31.16.7 2018/09/11 21:18:32 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,8 +58,6 @@
#include <compat/netbsd32/netbsd32_conv.h>
#include <compat/sys/mount.h>
-extern struct emul emul_netbsd32;
-
int
compat_30_netbsd32_getdents(struct lwp *l, const struct compat_30_netbsd32_getdents_args *uap, register_t *retval)
{
diff -r 5fc6b417f02c -r 2ca2227c8d39 sys/compat/netbsd32/netbsd32_compat_43.c
--- a/sys/compat/netbsd32/netbsd32_compat_43.c Tue Sep 11 09:22:51 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_43.c Tue Sep 11 21:18:32 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_43.c,v 1.54.14.4 2018/09/11 08:51:55 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_43.c,v 1.54.14.5 2018/09/11 21:18:32 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_43.c,v 1.54.14.4 2018/09/11 08:51:55 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_43.c,v 1.54.14.5 2018/09/11 21:18:32 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_43.h"
@@ -73,8 +73,6 @@
SYS_DEF(compat_43_netbsd32_sigsetmask);
#undef SYS_DEF
-extern struct emul emul_netbsd32;
-
static void
netbsd32_from_stat(const struct stat *sb, struct netbsd32_stat43 *sp32)
{
diff -r 5fc6b417f02c -r 2ca2227c8d39 sys/compat/netbsd32/netbsd32_compat_50.c
--- a/sys/compat/netbsd32/netbsd32_compat_50.c Tue Sep 11 09:22:51 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_50.c Tue Sep 11 21:18:32 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_50.c,v 1.32.16.5 2018/09/11 05:00:42 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_50.c,v 1.32.16.6 2018/09/11 21:18:32 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.32.16.5 2018/09/11 05:00:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.32.16.6 2018/09/11 21:18:32 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -73,8 +73,6 @@
#include <compat/sys/mount.h>
#include <compat/sys/time.h>
-extern struct emul emul_netbsd32;
-
#if defined(COMPAT_50)
/*
diff -r 5fc6b417f02c -r 2ca2227c8d39 sys/compat/netbsd32/netbsd32_compat_60.c
--- a/sys/compat/netbsd32/netbsd32_compat_60.c Tue Sep 11 09:22:51 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_60.c Tue Sep 11 21:18:32 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_60.c,v 1.3.2.5 2018/09/11 05:00:42 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_60.c,v 1.3.2.6 2018/09/11 21:18:32 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_60.c,v 1.3.2.5 2018/09/11 05:00:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_60.c,v 1.3.2.6 2018/09/11 21:18:32 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,8 +52,6 @@
#include <compat/netbsd32/netbsd32_syscallargs.h>
#include <compat/netbsd32/netbsd32_conv.h>
-extern struct emul emul_netbsd32;
-
int
compat_60_netbsd32__lwp_park(struct lwp *l,
const struct compat_60_netbsd32__lwp_park_args *uap, register_t *retval)
diff -r 5fc6b417f02c -r 2ca2227c8d39 sys/compat/netbsd32/netbsd32_exec.h
--- a/sys/compat/netbsd32/netbsd32_exec.h Tue Sep 11 09:22:51 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_exec.h Tue Sep 11 21:18:32 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_exec.h,v 1.33 2017/01/25 21:45:39 jakllsch Exp $ */
+/* $NetBSD: netbsd32_exec.h,v 1.33.12.1 2018/09/11 21:18:32 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -52,8 +52,6 @@
netbsd32_u_long a_drsize; /* data relocation size */
};
-extern struct emul emul_netbsd32;
-
#ifdef EXEC_AOUT
int netbsd32_exec_aout_prep_zmagic(struct lwp *, struct exec_package *);
int netbsd32_exec_aout_prep_nmagic(struct lwp *, struct exec_package *);
diff -r 5fc6b417f02c -r 2ca2227c8d39 sys/compat/netbsd32/netbsd32_ipc.c
--- a/sys/compat/netbsd32/netbsd32_ipc.c Tue Sep 11 09:22:51 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_ipc.c Tue Sep 11 21:18:32 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ipc.c,v 1.18.16.2 2018/03/13 04:12:09 pgoyette Exp $ */
+/* $NetBSD: netbsd32_ipc.c,v 1.18.16.3 2018/09/11 21:18:32 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.18.16.2 2018/03/13 04:12:09 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.18.16.3 2018/09/11 21:18:32 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sysv.h"
@@ -52,8 +52,6 @@
#include <compat/netbsd32/netbsd32_syscallargs.h>
#include <compat/netbsd32/netbsd32_conv.h>
-extern struct emul emul_netbsd32;
-
#define _PKG_ENTRY(name) \
{ NETBSD32_SYS_ ## name, 0, (sy_call_t *)name }
diff -r 5fc6b417f02c -r 2ca2227c8d39 sys/compat/netbsd32/netbsd32_mqueue.c
--- a/sys/compat/netbsd32/netbsd32_mqueue.c Tue Sep 11 09:22:51 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_mqueue.c Tue Sep 11 21:18:32 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_mqueue.c,v 1.6.18.2 2018/09/11 05:57:15 pgoyette Exp $ */
+/* $NetBSD: netbsd32_mqueue.c,v 1.6.18.3 2018/09/11 21:18:32 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_mqueue.c,v 1.6.18.2 2018/09/11 05:57:15 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_mqueue.c,v 1.6.18.3 2018/09/11 21:18:32 pgoyette Exp $");
#if defined(_KERNEL_OPT)
Home |
Main Index |
Thread Index |
Old Index