Module Name: src
Committed By: martin
Date: Sun May 6 09:35:33 UTC 2018
Modified Files:
src/sys/compat/common [netbsd-8]: compat_mod.c
Log Message:
Pull up following revision(s) (requested by pgoyette in ticket #807):
sys/compat/common/compat_mod.c: revision 1.29
Clean up a stray #ifdef _MODULE - it prevented definition of
COMPAT_SIGCONTEXT which in turn prevented building of the
SYS_compat16_sigaction_14 code.
Should address PR kern/53260
XXX Pull-up to netbsd-8
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/compat/common/compat_mod.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/common/compat_mod.c
diff -u src/sys/compat/common/compat_mod.c:1.24 src/sys/compat/common/compat_mod.c:1.24.8.1
--- src/sys/compat/common/compat_mod.c:1.24 Sat Nov 5 23:30:22 2016
+++ src/sys/compat/common/compat_mod.c Sun May 6 09:35:33 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_mod.c,v 1.24 2016/11/05 23:30:22 pgoyette Exp $ */
+/* $NetBSD: compat_mod.c,v 1.24.8.1 2018/05/06 09:35:33 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.24 2016/11/05 23:30:22 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.24.8.1 2018/05/06 09:35:33 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -69,15 +69,13 @@ MODULE(MODULE_CLASS_EXEC, compat, NULL);
int ttcompat(struct tty *, u_long, void *, int, struct lwp *);
-#ifdef _MODULE
#ifdef COMPAT_16
#if !defined(__amd64__) || defined(COMPAT_NETBSD32)
#define COMPAT_SIGCONTEXT
extern char sigcode[], esigcode[];
struct uvm_object *emul_netbsd_object;
-#endif
-#endif
-#endif /* _MODULE */
+#endif /* !defined(__amd64__) || defined(COMPAT_NETBSD32) */
+#endif /* COMPAT_16 */
extern krwlock_t exec_lock;
extern krwlock_t ttcompat_lock;
