Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/compat Fix fallout from do_sys_wait changes (hi, rmind!)
details: https://anonhg.NetBSD.org/src/rev/97906da8df48
branches: trunk
changeset: 748808:97906da8df48
user: rafal <rafal%NetBSD.org@localhost>
date: Thu Nov 05 18:39:38 2009 +0000
description:
Fix fallout from do_sys_wait changes (hi, rmind!)
diffstat:
sys/compat/svr4/svr4_misc.c | 8 +++-----
sys/compat/svr4_32/svr4_32_misc.c | 9 ++++-----
2 files changed, 7 insertions(+), 10 deletions(-)
diffs (73 lines):
diff -r 0d65fe0e309c -r 97906da8df48 sys/compat/svr4/svr4_misc.c
--- a/sys/compat/svr4/svr4_misc.c Thu Nov 05 18:39:00 2009 +0000
+++ b/sys/compat/svr4/svr4_misc.c Thu Nov 05 18:39:38 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_misc.c,v 1.147 2009/11/04 21:23:03 rmind Exp $ */
+/* $NetBSD: svr4_misc.c,v 1.148 2009/11/05 18:39:38 rafal Exp $ */
/*-
* Copyright (c) 1994, 2008 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_misc.c,v 1.147 2009/11/04 21:23:03 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_misc.c,v 1.148 2009/11/05 18:39:38 rafal Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -999,7 +999,6 @@
{
int options, status;
int error;
- int was_zombie;
struct rusage ru;
svr4_siginfo_t i;
int id = SCARG(uap, id);
@@ -1037,8 +1036,7 @@
SCARG(uap, grp), id,
SCARG(uap, info), SCARG(uap, options)));
- error = do_sys_wait(l, &id, &status, options, &ru,
- &was_zombie);
+ error = do_sys_wait(&id, &status, options, &ru);
retval[0] = id;
if (error != 0)
diff -r 0d65fe0e309c -r 97906da8df48 sys/compat/svr4_32/svr4_32_misc.c
--- a/sys/compat/svr4_32/svr4_32_misc.c Thu Nov 05 18:39:00 2009 +0000
+++ b/sys/compat/svr4_32/svr4_32_misc.c Thu Nov 05 18:39:38 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_32_misc.c,v 1.66 2009/11/04 21:23:03 rmind Exp $ */
+/* $NetBSD: svr4_32_misc.c,v 1.67 2009/11/05 18:39:38 rafal Exp $ */
/*-
* Copyright (c) 1994, 2008 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_misc.c,v 1.66 2009/11/04 21:23:03 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_misc.c,v 1.67 2009/11/05 18:39:38 rafal Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1006,7 +1006,7 @@
int
svr4_32_sys_waitsys(struct lwp *l, const struct svr4_32_sys_waitsys_args *uap, register_t *retval)
{
- int options, error, status, was_zombie;;
+ int options, error, status;
struct rusage ru;
int id = SCARG(uap, id);
@@ -1041,8 +1041,7 @@
if (SCARG(uap, options) & (SVR4_WSTOPPED|SVR4_WCONTINUED))
options |= WUNTRACED;
- error = do_sys_wait(l, &id, &status, options, &ru,
- &was_zombie);
+ error = do_sys_wait(&id, &status, options, &ru);
retval[0] = id;
if (error != 0)
Home |
Main Index |
Thread Index |
Old Index