diff --git a/sys/compat/hpux/hpux_file.c b/sys/compat/hpux/hpux_file.c
index 37d6841cb5ec..935395eb3310 100644
--- a/sys/compat/hpux/hpux_file.c
+++ b/sys/compat/hpux/hpux_file.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpux_file.c,v 1.35 2007/04/22 08:29:56 dsl Exp $	*/
+/*	$NetBSD: hpux_file.c,v 1.36 2007/04/30 09:20:18 dsl Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -119,7 +119,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpux_file.c,v 1.35 2007/04/22 08:29:56 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpux_file.c,v 1.36 2007/04/30 09:20:18 dsl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -209,9 +209,6 @@ hpux_sys_open(l, v, retval)
 	struct proc *p = l->l_proc;
 	struct sys_open_args oa;
 	int flags, nflags, error;
-	void *sg;
-
-	sg = stackgap_init(p, 0);
 
 	/*
 	 * Deal with the mode flags first, since they will affect
diff --git a/sys/compat/irix/irix_mount.c b/sys/compat/irix/irix_mount.c
index 51c98c32ea44..5c6107dab950 100644
--- a/sys/compat/irix/irix_mount.c
+++ b/sys/compat/irix/irix_mount.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: irix_mount.c,v 1.16 2007/04/22 08:29:57 dsl Exp $ */
+/*	$NetBSD: irix_mount.c,v 1.17 2007/04/30 09:20:19 dsl Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irix_mount.c,v 1.16 2007/04/22 08:29:57 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irix_mount.c,v 1.17 2007/04/30 09:20:19 dsl Exp $");
 
 #include <sys/types.h>
 #include <sys/signal.h>
@@ -67,7 +67,6 @@ irix_sys_getmountid(l, v, retval)
 		syscallarg(const char *) path;
 		syscallarg(irix_mountid_t *) buf;
 	} */ *uap = v;
-	void *sg = stackgap_init(l->l_proc, 0);
 	kauth_cred_t cred;
 	struct vnode *vp;
 	int error = 0;
diff --git a/sys/compat/linux/common/linux_uselib.c b/sys/compat/linux/common/linux_uselib.c
index 1dd1d02e1635..a64471c63a13 100644
--- a/sys/compat/linux/common/linux_uselib.c
+++ b/sys/compat/linux/common/linux_uselib.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_uselib.c,v 1.21 2007/04/22 08:29:57 dsl Exp $	*/
+/*	$NetBSD: linux_uselib.c,v 1.22 2007/04/30 09:20:19 dsl Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_uselib.c,v 1.21 2007/04/22 08:29:57 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_uselib.c,v 1.22 2007/04/30 09:20:19 dsl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -93,7 +93,6 @@ linux_sys_uselib(struct lwp *l, void *v, register_t *retval)
 	struct linux_sys_uselib_args /* {
 		syscallarg(const char *) path;
 	} */ *uap = v;
-	void *sg;
 	long bsize, dsize, tsize, taddr, baddr, daddr;
 	struct nameidata ni;
 	struct vnode *vp;
@@ -102,8 +101,6 @@ linux_sys_uselib(struct lwp *l, void *v, register_t *retval)
 	int i, magic, error;
 	size_t rem;
 
-	sg = stackgap_init(l->l_proc, 0);
-
 	NDINIT(&ni, LOOKUP, FOLLOW | TRYEMULROOT, UIO_USERSPACE, SCARG(uap, path), l);
 
 	if ((error = namei(&ni)))
diff --git a/sys/compat/netbsd32/netbsd32_compat_12.c b/sys/compat/netbsd32/netbsd32_compat_12.c
index 28ee1e3c9b1b..8b603b37fede 100644
--- a/sys/compat/netbsd32/netbsd32_compat_12.c
+++ b/sys/compat/netbsd32/netbsd32_compat_12.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_compat_12.c,v 1.26 2007/04/22 08:29:58 dsl Exp $	*/
+/*	$NetBSD: netbsd32_compat_12.c,v 1.27 2007/04/30 09:20:19 dsl Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.26 2007/04/22 08:29:58 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.27 2007/04/30 09:20:19 dsl Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -138,7 +138,6 @@ compat_12_netbsd32_stat12(l, v, retval)
 	void *v;
 	register_t *retval;
 {
-	struct proc *p = l->l_proc;
 	struct compat_12_netbsd32_stat12_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(netbsd32_stat12p_t) ub;
@@ -147,12 +146,10 @@ compat_12_netbsd32_stat12(l, v, retval)
 	struct stat12 sb12;
 	struct stat12 *sp12 = &sb12;
 	struct compat_12_sys_stat_args ua;
-	void *sg;
 	int rv;
 
 	NETBSD32TOP_UAP(path, const char);
 	SCARG(&ua, ub) = &sb12;
-	sg = stackgap_init(p, 0);
 
 	rv = compat_12_sys_stat(l, &ua, retval);
 	if (rv)
@@ -198,7 +195,6 @@ compat_12_netbsd32_lstat12(l, v, retval)
 	void *v;
 	register_t *retval;
 {
-	struct proc *p = l->l_proc;
 	struct compat_12_netbsd32_lstat12_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(netbsd32_stat12p_t) ub;
@@ -207,12 +203,10 @@ compat_12_netbsd32_lstat12(l, v, retval)
 	struct stat12 sb12;
 	struct stat12 *sp12 = &sb12;
 	struct compat_12_sys_lstat_args ua;
-	void *sg;
 	int rv;
 
 	NETBSD32TOP_UAP(path, const char);
 	SCARG(&ua, ub) = &sb12;
-	sg = stackgap_init(p, 0);
 
 	rv = compat_12_sys_lstat(l, &ua, retval);
 	if (rv)
diff --git a/sys/compat/osf1/osf1_file.c b/sys/compat/osf1/osf1_file.c
index 556f7ca81a1a..f65fadce1361 100644
--- a/sys/compat/osf1/osf1_file.c
+++ b/sys/compat/osf1/osf1_file.c
@@ -1,4 +1,4 @@
-/* $NetBSD: osf1_file.c,v 1.25 2007/04/27 23:53:15 dogcow Exp $ */
+/* $NetBSD: osf1_file.c,v 1.26 2007/04/30 09:20:19 dsl Exp $ */
 
 /*
  * Copyright (c) 1999 Christopher G. Demetriou.  All rights reserved.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osf1_file.c,v 1.25 2007/04/27 23:53:15 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osf1_file.c,v 1.26 2007/04/30 09:20:19 dsl Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_syscall_debug.h"
@@ -198,10 +198,8 @@ osf1_sys_open(l, v, retval)
 	register_t *retval;
 {
 	struct osf1_sys_open_args *uap = v;
-	struct proc *p = l->l_proc;
 	struct sys_open_args a;
 	const char *path;
-	void *sg;
 	unsigned long leftovers;
 #ifdef SYSCALL_DEBUG
 	char pnbuf[1024];
@@ -211,8 +209,6 @@ osf1_sys_open(l, v, retval)
 		printf("osf1_open: open: %s\n", pnbuf);
 #endif
 
-	sg = stackgap_init(p, 0);
-
 	/* translate flags */
 	SCARG(&a, flags) = emul_flags_translate(osf1_open_flags_xtab,
 	    SCARG(uap, flags), &leftovers);
diff --git a/sys/compat/svr4_32/svr4_32_stat.c b/sys/compat/svr4_32/svr4_32_stat.c
index 103072e00c11..15a939b87122 100644
--- a/sys/compat/svr4_32/svr4_32_stat.c
+++ b/sys/compat/svr4_32/svr4_32_stat.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_32_stat.c,v 1.27 2007/04/22 08:30:00 dsl Exp $	 */
+/*	$NetBSD: svr4_32_stat.c,v 1.28 2007/04/30 09:20:19 dsl Exp $	 */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_stat.c,v 1.27 2007/04/22 08:30:00 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_stat.c,v 1.28 2007/04/30 09:20:19 dsl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -266,8 +266,6 @@ svr4_32_sys_fstat(l, v, retval)
 	struct svr4_32_stat	svr4_st;
 	int			error;
 
-	void *sg = stackgap_init(p, 0);
-
 	error = do_sys_fstat(l, SCARG(uap, fd), &st);
 	if (error != 0)
 		return error;