Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/compat Merge the nathanw_sa branch.
details: https://anonhg.NetBSD.org/src/rev/f575387ab55e
branches: trunk
changeset: 541869:f575387ab55e
user: thorpej <thorpej%NetBSD.org@localhost>
date: Sun Jan 19 16:41:46 2003 +0000
description:
Merge the nathanw_sa branch.
diffstat:
sys/compat/linux/common/linux_oldolduname.c | 5 +-
sys/compat/svr4_32/svr4_32_exec.h | 4 +-
sys/compat/svr4_32/svr4_32_fcntl.c | 109 +++++++------
sys/compat/svr4_32/svr4_32_filio.c | 5 +-
sys/compat/svr4_32/svr4_32_ioctl.c | 14 +-
sys/compat/svr4_32/svr4_32_ioctl.h | 14 +-
sys/compat/svr4_32/svr4_32_ipc.c | 136 ++++++++--------
sys/compat/svr4_32/svr4_32_lwp.c | 204 ++++++++-----------------
sys/compat/svr4_32/svr4_32_misc.c | 197 +++++++++++++-----------
sys/compat/svr4_32/svr4_32_net.c | 5 +-
sys/compat/svr4_32/svr4_32_resource.c | 24 +-
sys/compat/svr4_32/svr4_32_signal.c | 80 +++++----
sys/compat/svr4_32/svr4_32_socket.c | 11 +-
sys/compat/svr4_32/svr4_32_sockio.c | 10 +-
sys/compat/svr4_32/svr4_32_stat.c | 116 ++++++++------
sys/compat/svr4_32/svr4_32_stream.c | 219 +++++++++++++--------------
sys/compat/svr4_32/svr4_32_sysent.c | 7 +-
sys/compat/svr4_32/svr4_32_termios.c | 12 +-
sys/compat/svr4_32/svr4_32_ucontext.h | 10 +-
sys/compat/svr4_32/syscalls.master | 3 +-
20 files changed, 586 insertions(+), 599 deletions(-)
diffs (truncated from 3566 to 300 lines):
diff -r a0016b76c909 -r f575387ab55e sys/compat/linux/common/linux_oldolduname.c
--- a/sys/compat/linux/common/linux_oldolduname.c Sun Jan 19 16:30:13 2003 +0000
+++ b/sys/compat/linux/common/linux_oldolduname.c Sun Jan 19 16:41:46 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_oldolduname.c,v 1.57 2003/01/18 21:26:36 jdolecek Exp $ */
+/* $NetBSD: linux_oldolduname.c,v 1.58 2003/01/19 16:41:46 thorpej Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -37,13 +37,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_oldolduname.c,v 1.57 2003/01/18 21:26:36 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_oldolduname.c,v 1.58 2003/01/19 16:41:46 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/mount.h>
+#include <sys/sa.h>
#include <sys/syscallargs.h>
#include <compat/linux/common/linux_types.h>
diff -r a0016b76c909 -r f575387ab55e sys/compat/svr4_32/svr4_32_exec.h
--- a/sys/compat/svr4_32/svr4_32_exec.h Sun Jan 19 16:30:13 2003 +0000
+++ b/sys/compat/svr4_32/svr4_32_exec.h Sun Jan 19 16:41:46 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_32_exec.h,v 1.4 2002/08/26 21:06:04 christos Exp $ */
+/* $NetBSD: svr4_32_exec.h,v 1.5 2003/01/19 16:47:13 thorpej Exp $ */
/*-
* Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
extern const struct emul emul_svr4_32;
-void svr4_32_setregs __P((struct proc *, struct exec_package *, u_long));
+void svr4_32_setregs __P((struct lwp *, struct exec_package *, u_long));
int svr4_32_elf32_probe __P((struct proc *, struct exec_package *, void *,
char *, vaddr_t *));
diff -r a0016b76c909 -r f575387ab55e sys/compat/svr4_32/svr4_32_fcntl.c
--- a/sys/compat/svr4_32/svr4_32_fcntl.c Sun Jan 19 16:30:13 2003 +0000
+++ b/sys/compat/svr4_32/svr4_32_fcntl.c Sun Jan 19 16:41:46 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_32_fcntl.c,v 1.5 2002/03/24 15:32:52 jdolecek Exp $ */
+/* $NetBSD: svr4_32_fcntl.c,v 1.6 2003/01/19 16:47:13 thorpej Exp $ */
/*-
* Copyright (c) 1994, 1997 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_fcntl.c,v 1.5 2002/03/24 15:32:52 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_fcntl.c,v 1.6 2003/01/19 16:47:13 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,6 +52,7 @@
#include <sys/malloc.h>
#include <sys/vnode.h>
+#include <sys/sa.h>
#include <sys/syscallargs.h>
#include <compat/svr4_32/svr4_32_types.h>
@@ -69,8 +70,8 @@
static void svr4_32_to_bsd_flock __P((struct svr4_32_flock *, struct flock *));
static void bsd_to_svr4_32_flock64 __P((struct flock *, struct svr4_32_flock64 *));
static void svr4_32_to_bsd_flock64 __P((struct svr4_32_flock64 *, struct flock *));
-static int fd_revoke __P((struct proc *, int, register_t *));
-static int fd_truncate __P((struct proc *, int, struct flock *, register_t *));
+static int fd_revoke __P((struct lwp *, int, register_t *));
+static int fd_truncate __P((struct lwp *, int, struct flock *, register_t *));
static u_long
svr4_32_to_bsd_cmd(cmd)
@@ -257,11 +258,12 @@
static int
-fd_revoke(p, fd, retval)
- struct proc *p;
+fd_revoke(l, fd, retval)
+ struct lwp *l;
int fd;
register_t *retval;
{
+ struct proc *p = l->l_proc;
struct filedesc *fdp = p->p_fd;
struct file *fp;
struct vnode *vp;
@@ -297,12 +299,13 @@
static int
-fd_truncate(p, fd, flp, retval)
- struct proc *p;
+fd_truncate(l, fd, flp, retval)
+ struct lwp *l;
int fd;
struct flock *flp;
register_t *retval;
{
+ struct proc *p = l->l_proc;
struct filedesc *fdp = p->p_fd;
struct file *fp;
off_t start, length;
@@ -351,17 +354,18 @@
SCARG(&ft, fd) = fd;
SCARG(&ft, length) = start;
- return sys_ftruncate(p, &ft, retval);
+ return sys_ftruncate(l, &ft, retval);
}
int
-svr4_32_sys_open(p, v, retval)
- struct proc *p;
+svr4_32_sys_open(l, v, retval)
+ struct lwp *l;
void *v;
register_t *retval;
{
struct svr4_32_sys_open_args *uap = v;
+ struct proc *p = l->l_proc;
int error;
struct sys_open_args cup;
@@ -376,7 +380,7 @@
CHECK_ALT_EXIST(p, &sg, SCARG(&cup, path));
SCARG(&cup, mode) = SCARG(uap, mode);
- error = sys_open(p, &cup, retval);
+ error = sys_open(l, &cup, retval);
if (error)
return error;
@@ -397,22 +401,23 @@
int
-svr4_32_sys_open64(p, v, retval)
- struct proc *p;
+svr4_32_sys_open64(l, v, retval)
+ struct lwp *l;
void *v;
register_t *retval;
{
- return svr4_32_sys_open(p, v, retval);
+ return svr4_32_sys_open(l, v, retval);
}
int
-svr4_32_sys_creat(p, v, retval)
- struct proc *p;
+svr4_32_sys_creat(l, v, retval)
+ struct lwp *l;
void *v;
register_t *retval;
{
struct svr4_32_sys_creat_args *uap = v;
+ struct proc *p = l->l_proc;
struct sys_open_args cup;
caddr_t sg = stackgap_init(p, 0);
@@ -422,23 +427,23 @@
SCARG(&cup, mode) = SCARG(uap, mode);
SCARG(&cup, flags) = O_WRONLY | O_CREAT | O_TRUNC;
- return sys_open(p, &cup, retval);
+ return sys_open(l, &cup, retval);
}
int
-svr4_32_sys_creat64(p, v, retval)
- struct proc *p;
+svr4_32_sys_creat64(l, v, retval)
+ struct lwp *l;
void *v;
register_t *retval;
{
- return svr4_32_sys_creat(p, v, retval);
+ return svr4_32_sys_creat(l, v, retval);
}
int
-svr4_32_sys_llseek(p, v, retval)
- struct proc *p;
+svr4_32_sys_llseek(l, v, retval)
+ struct lwp *l;
void *v;
register_t *retval;
{
@@ -456,17 +461,18 @@
#endif
SCARG(&ap, whence) = SCARG(uap, whence);
- return sys_lseek(p, &ap, retval);
+ return sys_lseek(l, &ap, retval);
}
int
-svr4_32_sys_access(p, v, retval)
- struct proc *p;
+svr4_32_sys_access(l, v, retval)
+ struct lwp *l;
void *v;
register_t *retval;
{
struct svr4_32_sys_access_args *uap = v;
struct sys_access_args cup;
+ struct proc *p = l->l_proc;
caddr_t sg = stackgap_init(p, 0);
@@ -474,13 +480,13 @@
CHECK_ALT_EXIST(p, &sg, SCARG(&cup, path));
SCARG(&cup, flags) = SCARG(uap, flags);
- return sys_access(p, &cup, retval);
+ return sys_access(l, &cup, retval);
}
int
-svr4_32_sys_pread(p, v, retval)
- struct proc *p;
+svr4_32_sys_pread(l, v, retval)
+ struct lwp *l;
void *v;
register_t *retval;
{
@@ -496,13 +502,13 @@
SCARG(&pra, nbyte) = SCARG(uap, nbyte);
SCARG(&pra, offset) = SCARG(uap, off);
- return (sys_pread(p, &pra, retval));
+ return (sys_pread(l, &pra, retval));
}
int
-svr4_32_sys_pread64(p, v, retval)
- struct proc *p;
+svr4_32_sys_pread64(l, v, retval)
+ struct lwp *l;
void *v;
register_t *retval;
{
@@ -519,13 +525,13 @@
SCARG(&pra, nbyte) = SCARG(uap, nbyte);
SCARG(&pra, offset) = SCARG(uap, off);
- return (sys_pread(p, &pra, retval));
+ return (sys_pread(l, &pra, retval));
}
int
-svr4_32_sys_pwrite(p, v, retval)
- struct proc *p;
+svr4_32_sys_pwrite(l, v, retval)
+ struct lwp *l;
void *v;
register_t *retval;
{
@@ -541,13 +547,13 @@
SCARG(&pwa, nbyte) = SCARG(uap, nbyte);
SCARG(&pwa, offset) = SCARG(uap, off);
- return (sys_pwrite(p, &pwa, retval));
+ return (sys_pwrite(l, &pwa, retval));
}
int
-svr4_32_sys_pwrite64(p, v, retval)
- struct proc *p;
+svr4_32_sys_pwrite64(l, v, retval)
+ struct lwp *l;
void *v;
register_t *retval;
{
@@ -563,17 +569,18 @@
SCARG(&pwa, nbyte) = SCARG(uap, nbyte);
SCARG(&pwa, offset) = SCARG(uap, off);
- return (sys_pwrite(p, &pwa, retval));
+ return (sys_pwrite(l, &pwa, retval));
}
Home |
Main Index |
Thread Index |
Old Index