Module Name: src
Committed By: njoly
Date: Wed Aug 31 08:12:44 UTC 2016
Modified Files:
src/sys/compat/linux/common: linux_misc.c linux_misc.h
Log Message:
Teach wait4 about WCONTINUED.
To generate a diff of this commit:
cvs rdiff -u -r1.231 -r1.232 src/sys/compat/linux/common/linux_misc.c
cvs rdiff -u -r1.24 -r1.25 src/sys/compat/linux/common/linux_misc.h
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.231 src/sys/compat/linux/common/linux_misc.c:1.232
--- src/sys/compat/linux/common/linux_misc.c:1.231 Sat Mar 14 08:32:08 2015
+++ src/sys/compat/linux/common/linux_misc.c Wed Aug 31 08:12:44 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_misc.c,v 1.231 2015/03/14 08:32:08 njoly Exp $ */
+/* $NetBSD: linux_misc.c,v 1.232 2016/08/31 08:12:44 njoly 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.231 2015/03/14 08:32:08 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.232 2016/08/31 08:12:44 njoly Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -231,6 +231,8 @@ linux_sys_wait4(struct lwp *l, const str
options |= WNOHANG;
if (linux_options & LINUX_WAIT4_WUNTRACED)
options |= WUNTRACED;
+ if (linux_options & LINUX_WAIT4_WCONTINUED)
+ options |= WCONTINUED;
if (linux_options & LINUX_WAIT4_WALL)
options |= WALLSIG;
if (linux_options & LINUX_WAIT4_WCLONE)
Index: src/sys/compat/linux/common/linux_misc.h
diff -u src/sys/compat/linux/common/linux_misc.h:1.24 src/sys/compat/linux/common/linux_misc.h:1.25
--- src/sys/compat/linux/common/linux_misc.h:1.24 Mon Nov 18 01:32:52 2013
+++ src/sys/compat/linux/common/linux_misc.h Wed Aug 31 08:12:44 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_misc.h,v 1.24 2013/11/18 01:32:52 chs Exp $ */
+/* $NetBSD: linux_misc.h,v 1.25 2016/08/31 08:12:44 njoly Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,14 +35,16 @@
/*
* Options passed to the Linux wait4() system call.
*/
-#define LINUX_WAIT4_WNOHANG 0x00000001
-#define LINUX_WAIT4_WUNTRACED 0x00000002
-#define LINUX_WAIT4_WNOTHREAD 0x20000000
-#define LINUX_WAIT4_WALL 0x40000000
-#define LINUX_WAIT4_WCLONE 0x80000000
+#define LINUX_WAIT4_WNOHANG 0x00000001
+#define LINUX_WAIT4_WUNTRACED 0x00000002
+#define LINUX_WAIT4_WCONTINUED 0x00000008
+#define LINUX_WAIT4_WNOTHREAD 0x20000000
+#define LINUX_WAIT4_WALL 0x40000000
+#define LINUX_WAIT4_WCLONE 0x80000000
#define LINUX_WAIT4_KNOWNFLAGS (LINUX_WAIT4_WNOHANG | \
LINUX_WAIT4_WUNTRACED | \
+ LINUX_WAIT4_WCONTINUED | \
LINUX_WAIT4_WNOTHREAD | \
LINUX_WAIT4_WALL | \
LINUX_WAIT4_WCLONE)
