Module Name: src
Committed By: christos
Date: Thu Nov 10 17:00:51 UTC 2016
Modified Files:
src/sys/compat/linux/common: linux_misc.c
src/sys/compat/linux32/common: linux32_wait.c
src/sys/compat/osf1: osf1_misc.c
src/sys/compat/svr4: svr4_misc.c
src/sys/compat/svr4_32: svr4_32_misc.c
Log Message:
GC WOPTSCHECKED
To generate a diff of this commit:
cvs rdiff -u -r1.232 -r1.233 src/sys/compat/linux/common/linux_misc.c
cvs rdiff -u -r1.11 -r1.12 src/sys/compat/linux32/common/linux32_wait.c
cvs rdiff -u -r1.86 -r1.87 src/sys/compat/osf1/osf1_misc.c
cvs rdiff -u -r1.156 -r1.157 src/sys/compat/svr4/svr4_misc.c
cvs rdiff -u -r1.76 -r1.77 src/sys/compat/svr4_32/svr4_32_misc.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/linux/common/linux_misc.c
diff -u src/sys/compat/linux/common/linux_misc.c:1.232 src/sys/compat/linux/common/linux_misc.c:1.233
--- src/sys/compat/linux/common/linux_misc.c:1.232 Wed Aug 31 04:12:44 2016
+++ src/sys/compat/linux/common/linux_misc.c Thu Nov 10 12:00:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_misc.c,v 1.232 2016/08/31 08:12:44 njoly Exp $ */
+/* $NetBSD: linux_misc.c,v 1.233 2016/11/10 17:00:51 christos Exp $ */
/*-
* Copyright (c) 1995, 1998, 1999, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.232 2016/08/31 08:12:44 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.233 2016/11/10 17:00:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -223,10 +223,10 @@ linux_sys_wait4(struct lwp *l, const str
proc_t *p;
linux_options = SCARG(uap, options);
- options = WOPTSCHECKED;
if (linux_options & ~(LINUX_WAIT4_KNOWNFLAGS))
return (EINVAL);
+ options = 0;
if (linux_options & LINUX_WAIT4_WNOHANG)
options |= WNOHANG;
if (linux_options & LINUX_WAIT4_WUNTRACED)
Index: src/sys/compat/linux32/common/linux32_wait.c
diff -u src/sys/compat/linux32/common/linux32_wait.c:1.11 src/sys/compat/linux32/common/linux32_wait.c:1.12
--- src/sys/compat/linux32/common/linux32_wait.c:1.11 Wed Nov 4 16:23:03 2009
+++ src/sys/compat/linux32/common/linux32_wait.c Thu Nov 10 12:00:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_wait.c,v 1.11 2009/11/04 21:23:03 rmind Exp $ */
+/* $NetBSD: linux32_wait.c,v 1.12 2016/11/10 17:00:51 christos Exp $ */
/*-
* Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_wait.c,v 1.11 2009/11/04 21:23:03 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_wait.c,v 1.12 2016/11/10 17:00:51 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -105,10 +105,10 @@ linux32_sys_wait4(struct lwp *l, const s
proc_t *p;
linux_options = SCARG(uap, options);
- options = WOPTSCHECKED;
if (linux_options & ~(LINUX_WAIT4_KNOWNFLAGS))
return EINVAL;
+ options = 0;
if (linux_options & LINUX_WAIT4_WNOHANG)
options |= WNOHANG;
if (linux_options & LINUX_WAIT4_WUNTRACED)
Index: src/sys/compat/osf1/osf1_misc.c
diff -u src/sys/compat/osf1/osf1_misc.c:1.86 src/sys/compat/osf1/osf1_misc.c:1.87
--- src/sys/compat/osf1/osf1_misc.c:1.86 Fri Jul 22 06:02:08 2011
+++ src/sys/compat/osf1/osf1_misc.c Thu Nov 10 12:00:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: osf1_misc.c,v 1.86 2011/07/22 10:02:08 njoly Exp $ */
+/* $NetBSD: osf1_misc.c,v 1.87 2016/11/10 17:00:51 christos Exp $ */
/*
* Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osf1_misc.c,v 1.86 2011/07/22 10:02:08 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osf1_misc.c,v 1.87 2016/11/10 17:00:51 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_syscall_debug.h"
@@ -406,7 +406,7 @@ osf1_sys_wait4(struct lwp *l, const stru
if (leftovers != 0)
return (EINVAL);
- error = do_sys_wait(&pid, &status, options | WOPTSCHECKED,
+ error = do_sys_wait(&pid, &status, options,
SCARG(uap, rusage) != NULL ? &netbsd_rusage : NULL);
retval[0] = pid;
Index: src/sys/compat/svr4/svr4_misc.c
diff -u src/sys/compat/svr4/svr4_misc.c:1.156 src/sys/compat/svr4/svr4_misc.c:1.157
--- src/sys/compat/svr4/svr4_misc.c:1.156 Fri Sep 5 05:21:55 2014
+++ src/sys/compat/svr4/svr4_misc.c Thu Nov 10 12:00:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_misc.c,v 1.156 2014/09/05 09:21:55 matt Exp $ */
+/* $NetBSD: svr4_misc.c,v 1.157 2016/11/10 17:00:51 christos 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.156 2014/09/05 09:21:55 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_misc.c,v 1.157 2016/11/10 17:00:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1030,7 +1030,7 @@ svr4_sys_waitsys(struct lwp *l, const st
}
/* Translate options */
- options = WOPTSCHECKED;
+ options = 0;
if (SCARG(uap, options) & SVR4_WNOWAIT)
options |= WNOWAIT;
if (SCARG(uap, options) & SVR4_WNOHANG)
Index: src/sys/compat/svr4_32/svr4_32_misc.c
diff -u src/sys/compat/svr4_32/svr4_32_misc.c:1.76 src/sys/compat/svr4_32/svr4_32_misc.c:1.77
--- src/sys/compat/svr4_32/svr4_32_misc.c:1.76 Sun Feb 28 18:24:36 2016
+++ src/sys/compat/svr4_32/svr4_32_misc.c Thu Nov 10 12:00:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_32_misc.c,v 1.76 2016/02/28 23:24:36 khorben Exp $ */
+/* $NetBSD: svr4_32_misc.c,v 1.77 2016/11/10 17:00:51 christos 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.76 2016/02/28 23:24:36 khorben Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_misc.c,v 1.77 2016/11/10 17:00:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1044,7 +1044,7 @@ svr4_32_sys_waitsys(struct lwp *l, const
SCARG(uap, info), SCARG(uap, options)));
/* Translate options */
- options = WOPTSCHECKED;
+ options = 0;
if (SCARG(uap, options) & SVR4_WNOWAIT)
options |= WNOWAIT;
if (SCARG(uap, options) & SVR4_WNOHANG)
