 @@ -1,14 +1,14 @@
-/*	$NetBSD: compat_mod.c,v 1.14 2011/08/08 23:44:06 jakllsch Exp $	*/
+/*	$NetBSD: compat_mod.c,v 1.15 2013/01/22 01:47:20 christos Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software developed for The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,27 +24,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Linkage for the compat module: spaghetti.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.14 2011/08/08 23:44:06 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.15 2013/01/22 01:47:20 christos Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
 #include "opt_compat_43.h"
 #include "opt_ntp.h"
 #include "opt_sysv.h"
 #include "opt_lfs.h"
 #endif
 #include <sys/systm.h>
 #include <sys/module.h>
 #include <sys/rwlock.h>
 #include <sys/tty.h>
 @@ -53,27 +53,28 @@ __KERNEL_RCSID(0, "$NetBSD: compat_mod.c
 #include <sys/syscallargs.h>
 #include <sys/syscallvar.h>
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_object.h>
 #include <compat/common/compat_util.h>
 MODULE(MODULE_CLASS_MISC, compat, NULL);
 int	ttcompat(struct tty *, u_long, void *, int, struct lwp *);
 #ifdef COMPAT_16
-#if !(defined(__amd64__) && !defined(COMPAT_NETBSD32))
+#if !defined(__amd64__) || defined(COMPAT_NETBSD32)
 #define COMPAT_SIGCONTEXT
 extern char sigcode[], esigcode[];
 struct uvm_object *emul_netbsd_object;
 #endif
 #endif
 extern krwlock_t exec_lock;
 extern krwlock_t ttcompat_lock;
 static const struct syscall_package compat_syscalls[] = {
 #if defined(COMPAT_43)
 	{ SYS_compat_43_fstat43, 0, (sy_call_t *)compat_43_sys_fstat },
 	{ SYS_compat_43_lstat43, 0, (sy_call_t *)compat_43_sys_lstat },
 	{ SYS_compat_43_oaccept, 0, (sy_call_t *)compat_43_sys_accept },
 @@ -149,27 +150,27 @@ static const struct syscall_package comp
 #if defined(COMPAT_14)
 # if defined(SYSVSEM)
 	{ SYS_compat_14___semctl, 0, (sy_call_t *)compat_14_sys___semctl },
 # endif
 # if defined(SYSVMSG)
 	{ SYS_compat_14_msgctl, 0, (sy_call_t *)compat_14_sys_msgctl },
 # endif
 # if defined(SYSVSHM)
 	{ SYS_compat_14_shmctl, 0, (sy_call_t *)compat_14_sys_shmctl },
 # endif
 #endif
 #if defined(COMPAT_16)
-#if !(defined(__amd64__) && !defined(COMPAT_NETBSD32))
+#if defined(COMPAT_SIGCONTEXT)
 	{ SYS_compat_16___sigaction14, 0, (sy_call_t *)compat_16_sys___sigaction14 },
 	{ SYS_compat_16___sigreturn14, 0, (sy_call_t *)compat_16_sys___sigreturn14 },
 #endif
 #endif
 #if defined(COMPAT_20)
 	{ SYS_compat_20_fhstatfs, 0, (sy_call_t *)compat_20_sys_fhstatfs },
 	{ SYS_compat_20_fstatfs, 0, (sy_call_t *)compat_20_sys_fstatfs },
 	{ SYS_compat_20_getfsstat, 0, (sy_call_t *)compat_20_sys_getfsstat },
 	{ SYS_compat_20_statfs, 0, (sy_call_t *)compat_20_sys_statfs },
 #endif
 #if defined(COMPAT_30)
 @@ -248,27 +249,27 @@ compat_modcmd(modcmd_t cmd, void *arg)
 	int error;
 	switch (cmd) {
 	case MODULE_CMD_INIT:
 		error = syscall_establish(NULL, compat_syscalls);
 		if (error != 0) {
 			return error;
+		}
 #ifdef COMPAT_43
 		KASSERT(ttcompatvec == NULL);
 		ttcompatvec = ttcompat;
 #endif
 #ifdef COMPAT_16
-#if !(defined(__amd64__) && !defined(COMPAT_NETBSD32))
+#if defined(COMPAT_SIGCONTEXT)
 		KASSERT(emul_netbsd.e_sigobject == NULL);
 		rw_enter(&exec_lock, RW_WRITER);
 		emul_netbsd.e_sigcode = sigcode;
 		emul_netbsd.e_esigcode = esigcode;
 		emul_netbsd.e_sigobject = &emul_netbsd_object;
 		rw_exit(&exec_lock);
 		KASSERT(sendsig_sigcontext_vec == NULL);
 		sendsig_sigcontext_vec = sendsig_sigcontext;
 #endif
 #endif
 #if defined(COMPAT_09) || defined(COMPAT_43)
 		compat_sysctl_init();
 #endif
 @@ -301,27 +302,27 @@ compat_modcmd(modcmd_t cmd, void *arg)
+		}
 #ifdef COMPAT_43
 		/* Unlink ttcompatvec. */
 		if (rw_tryenter(&ttcompat_lock, RW_WRITER)) {
 			ttcompatvec = NULL;
 			rw_exit(&ttcompat_lock);
 		} else {
 			error = syscall_establish(NULL, compat_syscalls);
 			KASSERT(error == 0);
 			return EBUSY;
+		}
 #endif
 #ifdef COMPAT_16
-#if !(defined(__amd64__) && !defined(COMPAT_NETBSD32))
+#if defined(COMPAT_SIGCONTEXT)
 		/*
 		 * The sigobject may persist if still in use, but
 		 * is reference counted so will die eventually.
 		 */
 		rw_enter(&exec_lock, RW_WRITER);
 		if (emul_netbsd_object != NULL) {
 			(*emul_netbsd_object->pgops->pgo_detach)
 			    (emul_netbsd_object);
+		}
 		emul_netbsd_object = NULL;
 		emul_netbsd.e_sigcode = NULL;
 		emul_netbsd.e_esigcode = NULL;
 		emul_netbsd.e_sigobject = NULL;