Module Name: src
Committed By: pgoyette
Date: Tue Sep 11 21:18:33 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h
netbsd32_compat_09.c netbsd32_compat_12.c netbsd32_compat_13.c
netbsd32_compat_20.c netbsd32_compat_30.c netbsd32_compat_43.c
netbsd32_compat_50.c netbsd32_compat_60.c netbsd32_exec.h
netbsd32_ipc.c netbsd32_mqueue.c netbsd32_nfssvc.c
netbsd32_ptrace.c
Log Message:
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@
To generate a diff of this commit:
cvs rdiff -u -r1.116.2.3 -r1.116.2.4 src/sys/compat/netbsd32/netbsd32.h
cvs rdiff -u -r1.18.86.4 -r1.18.86.5 \
src/sys/compat/netbsd32/netbsd32_compat_09.c
cvs rdiff -u -r1.33.36.6 -r1.33.36.7 \
src/sys/compat/netbsd32/netbsd32_compat_12.c
cvs rdiff -u -r1.26.28.5 -r1.26.28.6 \
src/sys/compat/netbsd32/netbsd32_compat_13.c
cvs rdiff -u -r1.36.10.7 -r1.36.10.8 \
src/sys/compat/netbsd32/netbsd32_compat_20.c
cvs rdiff -u -r1.31.16.6 -r1.31.16.7 \
src/sys/compat/netbsd32/netbsd32_compat_30.c
cvs rdiff -u -r1.54.14.4 -r1.54.14.5 \
src/sys/compat/netbsd32/netbsd32_compat_43.c
cvs rdiff -u -r1.32.16.5 -r1.32.16.6 \
src/sys/compat/netbsd32/netbsd32_compat_50.c
cvs rdiff -u -r1.3.2.5 -r1.3.2.6 src/sys/compat/netbsd32/netbsd32_compat_60.c
cvs rdiff -u -r1.33 -r1.33.12.1 src/sys/compat/netbsd32/netbsd32_exec.h
cvs rdiff -u -r1.18.16.2 -r1.18.16.3 src/sys/compat/netbsd32/netbsd32_ipc.c
cvs rdiff -u -r1.6.18.2 -r1.6.18.3 src/sys/compat/netbsd32/netbsd32_mqueue.c
cvs rdiff -u -r1.5 -r1.5.16.1 src/sys/compat/netbsd32/netbsd32_nfssvc.c
cvs rdiff -u -r1.5 -r1.5.2.1 src/sys/compat/netbsd32/netbsd32_ptrace.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32.h
diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.3 src/sys/compat/netbsd32/netbsd32.h:1.116.2.4
--- src/sys/compat/netbsd32/netbsd32.h:1.116.2.3 Thu Sep 6 06:55:46 2018
+++ src/sys/compat/netbsd32/netbsd32.h Tue Sep 11 21:18:32 2018
@@ -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 @@ struct iovec *netbsd32_get_iov(struct ne
#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_ */
Index: src/sys/compat/netbsd32/netbsd32_compat_09.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.4 src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.5
--- src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.4 Tue Sep 11 05:00:42 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_09.c Tue Sep 11 21:18:32 2018
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#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)
{
Index: src/sys/compat/netbsd32/netbsd32_compat_12.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.6 src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.7
--- src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.6 Tue Sep 11 05:00:42 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_12.c Tue Sep 11 21:18:32 2018
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#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 *);
Index: src/sys/compat/netbsd32/netbsd32_compat_13.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_13.c:1.26.28.5 src/sys/compat/netbsd32/netbsd32_compat_13.c:1.26.28.6
--- src/sys/compat/netbsd32/netbsd32_compat_13.c:1.26.28.5 Tue Sep 11 05:00:42 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_13.c Tue Sep 11 21:18:32 2018
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#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)
{
Index: src/sys/compat/netbsd32/netbsd32_compat_20.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_20.c:1.36.10.7 src/sys/compat/netbsd32/netbsd32_compat_20.c:1.36.10.8
--- src/sys/compat/netbsd32/netbsd32_compat_20.c:1.36.10.7 Tue Sep 11 05:00:42 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_20.c Tue Sep 11 21:18:32 2018
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#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 *);
Index: src/sys/compat/netbsd32/netbsd32_compat_30.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.6 src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.7
--- src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.6 Tue Sep 11 05:00:42 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_30.c Tue Sep 11 21:18:32 2018
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#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)
{
Index: src/sys/compat/netbsd32/netbsd32_compat_43.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_43.c:1.54.14.4 src/sys/compat/netbsd32/netbsd32_compat_43.c:1.54.14.5
--- src/sys/compat/netbsd32/netbsd32_compat_43.c:1.54.14.4 Tue Sep 11 08:51:55 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_43.c Tue Sep 11 21:18:32 2018
@@ -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_sigblock);
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)
{
Index: src/sys/compat/netbsd32/netbsd32_compat_50.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_50.c:1.32.16.5 src/sys/compat/netbsd32/netbsd32_compat_50.c:1.32.16.6
--- src/sys/compat/netbsd32/netbsd32_compat_50.c:1.32.16.5 Tue Sep 11 05:00:42 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_50.c Tue Sep 11 21:18:32 2018
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#include <compat/sys/mount.h>
#include <compat/sys/time.h>
-extern struct emul emul_netbsd32;
-
#if defined(COMPAT_50)
/*
Index: src/sys/compat/netbsd32/netbsd32_compat_60.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_60.c:1.3.2.5 src/sys/compat/netbsd32/netbsd32_compat_60.c:1.3.2.6
--- src/sys/compat/netbsd32/netbsd32_compat_60.c:1.3.2.5 Tue Sep 11 05:00:42 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_60.c Tue Sep 11 21:18:32 2018
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#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)
Index: src/sys/compat/netbsd32/netbsd32_exec.h
diff -u src/sys/compat/netbsd32/netbsd32_exec.h:1.33 src/sys/compat/netbsd32/netbsd32_exec.h:1.33.12.1
--- src/sys/compat/netbsd32/netbsd32_exec.h:1.33 Wed Jan 25 21:45:39 2017
+++ src/sys/compat/netbsd32/netbsd32_exec.h Tue Sep 11 21:18:32 2018
@@ -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 @@ struct netbsd32_exec {
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 *);
Index: src/sys/compat/netbsd32/netbsd32_ipc.c
diff -u src/sys/compat/netbsd32/netbsd32_ipc.c:1.18.16.2 src/sys/compat/netbsd32/netbsd32_ipc.c:1.18.16.3
--- src/sys/compat/netbsd32/netbsd32_ipc.c:1.18.16.2 Tue Mar 13 04:12:09 2018
+++ src/sys/compat/netbsd32/netbsd32_ipc.c Tue Sep 11 21:18:32 2018
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc
#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 }
Index: src/sys/compat/netbsd32/netbsd32_mqueue.c
diff -u src/sys/compat/netbsd32/netbsd32_mqueue.c:1.6.18.2 src/sys/compat/netbsd32/netbsd32_mqueue.c:1.6.18.3
--- src/sys/compat/netbsd32/netbsd32_mqueue.c:1.6.18.2 Tue Sep 11 05:57:15 2018
+++ src/sys/compat/netbsd32/netbsd32_mqueue.c Tue Sep 11 21:18:32 2018
@@ -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)
#include "opt_compat_netbsd.h"
@@ -47,8 +47,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mqu
#include <compat/netbsd32/netbsd32_syscallargs.h>
#include <compat/netbsd32/netbsd32_conv.h>
-extern struct emul emul_netbsd32;
-
int
netbsd32_mq_open(struct lwp *l, const struct netbsd32_mq_open_args *uap,
register_t *retval)
Index: src/sys/compat/netbsd32/netbsd32_nfssvc.c
diff -u src/sys/compat/netbsd32/netbsd32_nfssvc.c:1.5 src/sys/compat/netbsd32/netbsd32_nfssvc.c:1.5.16.1
--- src/sys/compat/netbsd32/netbsd32_nfssvc.c:1.5 Sat Oct 15 06:50:13 2016
+++ src/sys/compat/netbsd32/netbsd32_nfssvc.c Tue Sep 11 21:18:32 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_nfssvc.c,v 1.5 2016/10/15 06:50:13 skrll Exp $ */
+/* $NetBSD: netbsd32_nfssvc.c,v 1.5.16.1 2018/09/11 21:18:32 pgoyette Exp $ */
/*
* Copyright (c) 2015 Matthew R. Green
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_nfssvc.c,v 1.5 2016/10/15 06:50:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_nfssvc.c,v 1.5.16.1 2018/09/11 21:18:32 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_nfs.h"
@@ -53,8 +53,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_nfs
#include <nfs/nfs.h>
#include <nfs/nfs_var.h>
-extern struct emul emul_netbsd32;
-
static int nfssvc32_addsock_in(struct nfsd_args *, const void *);
static int nfssvc32_setexports_in(struct mountd_exports_list *, const void *);
static int nfssvc32_nsd_in(struct nfsd_srvargs *, const void *);
Index: src/sys/compat/netbsd32/netbsd32_ptrace.c
diff -u src/sys/compat/netbsd32/netbsd32_ptrace.c:1.5 src/sys/compat/netbsd32/netbsd32_ptrace.c:1.5.2.1
--- src/sys/compat/netbsd32/netbsd32_ptrace.c:1.5 Sun Dec 17 20:59:27 2017
+++ src/sys/compat/netbsd32/netbsd32_ptrace.c Tue Sep 11 21:18:32 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ptrace.c,v 1.5 2017/12/17 20:59:27 christos Exp $ */
+/* $NetBSD: netbsd32_ptrace.c,v 1.5.2.1 2018/09/11 21:18:32 pgoyette Exp $ */
/*
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_ptrace.c,v 1.5 2017/12/17 20:59:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ptrace.c,v 1.5.2.1 2018/09/11 21:18:32 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ptrace.h"
@@ -47,9 +47,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_ptr
#include <compat/netbsd32/netbsd32_syscallargs.h>
#include <compat/netbsd32/netbsd32_conv.h>
-extern struct emul emul_netbsd32;
-
-
/*
* PTRACE methods
*/
