Module Name: src
Committed By: pgoyette
Date: Fri Sep 14 08:53:22 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h netbsd32_module.c
netbsd32_netbsd.c
Log Message:
Move some extern definitions into netbsd32_netbsd.h rather than having
them in the .c files.
To generate a diff of this commit:
cvs rdiff -u -r1.116.2.5 -r1.116.2.6 src/sys/compat/netbsd32/netbsd32.h
cvs rdiff -u -r1.6.2.5 -r1.6.2.6 src/sys/compat/netbsd32/netbsd32_module.c
cvs rdiff -u -r1.214.2.5 -r1.214.2.6 \
src/sys/compat/netbsd32/netbsd32_netbsd.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.5 src/sys/compat/netbsd32/netbsd32.h:1.116.2.6
--- src/sys/compat/netbsd32/netbsd32.h:1.116.2.5 Fri Sep 14 08:38:37 2018
+++ src/sys/compat/netbsd32/netbsd32.h Fri Sep 14 08:53:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.116.2.5 2018/09/14 08:38:37 pgoyette Exp $ */
+/* $NetBSD: netbsd32.h,v 1.116.2.6 2018/09/14 08:53:22 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green
@@ -1167,6 +1167,17 @@ SYSCTL_SETUP_PROTO(netbsd32_sysctl_emul_
extern void (*vec_netbsd32_sendsig)(const ksiginfo_t *, const sigset_t *);
+extern struct sysent netbsd32_sysent[];
+extern const uint32_t netbsd32_sysent_nomodbits[];
+#ifdef SYSCALL_DEBUG
+extern const char * const netbsd32_syscallnames[];
+#endif
+
+extern struct sysctlnode netbsd32_sysctl_root;
+
+extern int (*vec_compat32_80_modctl)(struct lwp *,
+ const struct netbsd32_modctl_args *, register_t *);
+
/*
* Finally, declare emul_netbsd32 as this is needed in lots of
* places when calling syscall_{,dis}establish()
Index: src/sys/compat/netbsd32/netbsd32_module.c
diff -u src/sys/compat/netbsd32/netbsd32_module.c:1.6.2.5 src/sys/compat/netbsd32/netbsd32_module.c:1.6.2.6
--- src/sys/compat/netbsd32/netbsd32_module.c:1.6.2.5 Tue Sep 11 04:53:42 2018
+++ src/sys/compat/netbsd32/netbsd32_module.c Fri Sep 14 08:53:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_module.c,v 1.6.2.5 2018/09/11 04:53:42 pgoyette Exp $ */
+/* $NetBSD: netbsd32_module.c,v 1.6.2.6 2018/09/14 08:53:22 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_module.c,v 1.6.2.5 2018/09/11 04:53:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_module.c,v 1.6.2.6 2018/09/14 08:53:22 pgoyette Exp $");
#include <sys/param.h>
#include <sys/dirent.h>
@@ -42,9 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mod
#include <compat/netbsd32/netbsd32_syscallargs.h>
#include <compat/netbsd32/netbsd32_conv.h>
-extern int (*vec_compat32_80_modctl)(struct lwp *,
- const struct netbsd32_modctl_args *, register_t *);
-
static int
modctl32_handle_stat(struct netbsd32_iovec *iov, void *arg)
{
Index: src/sys/compat/netbsd32/netbsd32_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.214.2.5 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.214.2.6
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.214.2.5 Wed Sep 12 01:26:40 2018
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c Fri Sep 14 08:53:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.214.2.5 2018/09/12 01:26:40 pgoyette Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.214.2.6 2018/09/14 08:53:22 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.214.2.5 2018/09/12 01:26:40 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.214.2.6 2018/09/14 08:53:22 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -89,11 +89,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_net
#include <ddb/ddbvar.h>
#endif
-extern struct sysent netbsd32_sysent[];
-extern const uint32_t netbsd32_sysent_nomodbits[];
-#ifdef SYSCALL_DEBUG
-extern const char * const netbsd32_syscallnames[];
-#endif
#ifdef __HAVE_SYSCALL_INTERN
void netbsd32_syscall_intern(struct proc *);
#else
@@ -102,8 +97,6 @@ void syscall(void);
#define LIMITCHECK(a, b) ((a) != RLIM_INFINITY && (a) > (b))
-extern struct sysctlnode netbsd32_sysctl_root;
-
#ifdef MODULAR
#include <compat/netbsd32/netbsd32_syscalls_autoload.c>
#endif
