Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/compat GC WOPTSCHECKED



details:   https://anonhg.NetBSD.org/src/rev/02b71cdecdc0
branches:  trunk
changeset: 818968:02b71cdecdc0
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Nov 10 17:00:51 2016 +0000

description:
GC WOPTSCHECKED

diffstat:

 sys/compat/linux/common/linux_misc.c     |  6 +++---
 sys/compat/linux32/common/linux32_wait.c |  6 +++---
 sys/compat/osf1/osf1_misc.c              |  6 +++---
 sys/compat/svr4/svr4_misc.c              |  6 +++---
 sys/compat/svr4_32/svr4_32_misc.c        |  6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diffs (141 lines):

diff -r f725f2941c85 -r 02b71cdecdc0 sys/compat/linux/common/linux_misc.c
--- a/sys/compat/linux/common/linux_misc.c      Thu Nov 10 15:38:51 2016 +0000
+++ b/sys/compat/linux/common/linux_misc.c      Thu Nov 10 17:00:51 2016 +0000
@@ -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 @@
        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)
diff -r f725f2941c85 -r 02b71cdecdc0 sys/compat/linux32/common/linux32_wait.c
--- a/sys/compat/linux32/common/linux32_wait.c  Thu Nov 10 15:38:51 2016 +0000
+++ b/sys/compat/linux32/common/linux32_wait.c  Thu Nov 10 17:00:51 2016 +0000
@@ -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 @@
        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)
diff -r f725f2941c85 -r 02b71cdecdc0 sys/compat/osf1/osf1_misc.c
--- a/sys/compat/osf1/osf1_misc.c       Thu Nov 10 15:38:51 2016 +0000
+++ b/sys/compat/osf1/osf1_misc.c       Thu Nov 10 17:00:51 2016 +0000
@@ -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 @@
        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;
diff -r f725f2941c85 -r 02b71cdecdc0 sys/compat/svr4/svr4_misc.c
--- a/sys/compat/svr4/svr4_misc.c       Thu Nov 10 15:38:51 2016 +0000
+++ b/sys/compat/svr4/svr4_misc.c       Thu Nov 10 17:00:51 2016 +0000
@@ -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 @@
        }
 
        /* Translate options */
-       options = WOPTSCHECKED;
+       options = 0;
        if (SCARG(uap, options) & SVR4_WNOWAIT)
                options |= WNOWAIT;
        if (SCARG(uap, options) & SVR4_WNOHANG)
diff -r f725f2941c85 -r 02b71cdecdc0 sys/compat/svr4_32/svr4_32_misc.c
--- a/sys/compat/svr4_32/svr4_32_misc.c Thu Nov 10 15:38:51 2016 +0000
+++ b/sys/compat/svr4_32/svr4_32_misc.c Thu Nov 10 17:00:51 2016 +0000
@@ -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 @@
                 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)



Home | Main Index | Thread Index | Old Index