more rfork mop-up

6 files changed, 19 insertions, 40 deletions

diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index 1e0af58a3ba..dc895475a7c 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysctl.3,v 1.213 2012/04/10 15:57:36 guenther Exp $
+.\"	$OpenBSD: sysctl.3,v 1.214 2012/04/12 14:25:57 deraadt Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: April 10 2012 $
+.Dd $Mdocdate: April 12 2012 $
 .Dt SYSCTL 3
 .Os
 .Sh NAME
@@ -599,7 +599,7 @@ This structure contains information about the number of
 .Xr fork 2 ,
 .Xr vfork 2 ,
 and
-.Xr rfork 2
+.Xr __tfork 2
 system calls as well as kernel thread creations since system startup,
 and the number of pages of virtual memory involved in each.
 .It Dv KERN_FSCALE
diff --git a/lib/libc/sys/Lint_rfork.c b/lib/libc/sys/Lint_rfork.c
deleted file mode 100644
index 0a7be328a5f..00000000000
--- a/lib/libc/sys/Lint_rfork.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*	$OpenBSD: Lint_rfork.c,v 1.1 2004/09/14 22:18:35 deraadt Exp $	*/
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <unistd.h>
-
-/*ARGSUSED*/
-int
-rfork(int flags)
-{
-	return (0);
-}
diff --git a/lib/libc/sys/__get_tcb.2 b/lib/libc/sys/__get_tcb.2
index e27fde543af..58cf27191e8 100644
--- a/lib/libc/sys/__get_tcb.2
+++ b/lib/libc/sys/__get_tcb.2
@@ -1,4 +1,4 @@
-.\" $OpenBSD: __get_tcb.2,v 1.3 2012/03/04 21:23:48 guenther Exp $
+.\" $OpenBSD: __get_tcb.2,v 1.4 2012/04/12 14:25:57 deraadt Exp $
 .\"
 .\" Copyright (c) 2011 Philip Guenther <guenther@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: March 4 2012 $
+.Dd $Mdocdate: April 12 2012 $
 .Dt __GET_TCB 2
 .Os
 .Sh NAME
@@ -42,7 +42,7 @@ New threads (including the first thread of a new process) created using
 .Xr fork 2 ,
 .Xr vfork 2 ,
 or
-.Xr rfork 2 ,
+.Xr __tfork 2 ,
 inherit the TCB address of the thread that created them.
 .Xr execve 2
 resets it to zero.
@@ -53,7 +53,7 @@ register which can be accessed from userspace.
 .Fn __get_tcb
 returns the address of the thread control block of the current thread.
 .Sh SEE ALSO
-.Xr rfork 2
+.Xr __tfork 2
 .Sh HISTORY
 The
 .Fn __get_tcb
diff --git a/lib/libc/sys/kqueue.2 b/lib/libc/sys/kqueue.2
index 76a9664e95f..55266bff364 100644
--- a/lib/libc/sys/kqueue.2
+++ b/lib/libc/sys/kqueue.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: kqueue.2,v 1.24 2012/02/18 08:19:38 ajacoutot Exp $
+.\"	$OpenBSD: kqueue.2,v 1.25 2012/04/12 14:25:57 deraadt Exp $
 .\"
 .\" Copyright (c) 2000 Jonathan Lemon
 .\" All rights reserved.
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.18 2001/02/14 08:48:35 guido Exp $
 .\"
-.Dd $Mdocdate: February 18 2012 $
+.Dd $Mdocdate: April 12 2012 $
 .Dt KQUEUE 2
 .Os
 .Sh NAME
@@ -75,12 +75,6 @@ on a file descriptor will remove any kevents that reference the descriptor.
 creates a new kernel event queue and returns a descriptor.
 The queue is not inherited by a child created with
 .Xr fork 2 .
-However, if
-.Xr rfork 2
-is called without the
-.Dv RFFDG
-flag, then the descriptor table is shared,
-which will allow sharing of the kqueue between two processes.
 Similarly, kqueues cannot be passed across UNIX-domain sockets.
 .Pp
 .Fn kevent
diff --git a/share/man/man9/fork1.9 b/share/man/man9/fork1.9
index 3cd79b87def..37d98914ec8 100644
--- a/share/man/man9/fork1.9
+++ b/share/man/man9/fork1.9
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fork1.9,v 1.16 2011/11/16 10:05:45 jmc Exp $
+.\"	$OpenBSD: fork1.9,v 1.17 2012/04/12 14:25:57 deraadt Exp $
 .\"	$NetBSD: fork1.9,v 1.3 1999/03/16 00:40:47 garbled Exp $
 .\"
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 16 2011 $
+.Dd $Mdocdate: April 12 2012 $
 .Dt FORK1 9
 .Os
 .Sh NAME
@@ -57,7 +57,7 @@ creates a new process out of
 which should be the current process.
 This function is used primarily to implement the
 .Xr fork 2 ,
-.Xr rfork 2 ,
+.Xr __tfork 2 ,
 .Xr vfork 2
 system calls, as well as the
 .Xr kthread_create 9
@@ -78,9 +78,9 @@ The call is done by the
 .Xr vfork 2
 system call.
 Used only for statistics.
-.It Dv FORK_RFORK
+.It Dv FORK_TFORK
 The call is done by the
-.Xr rfork 2
+.Xr __tfork 2
 system call.
 Used only for statistics.
 .It Dv FORK_TFORK
@@ -199,7 +199,7 @@ user id would be exceeded.
 .Sh SEE ALSO
 .Xr execve 2 ,
 .Xr fork 2 ,
-.Xr rfork 2 ,
+.Xr __tfork 2 ,
 .Xr vfork 2 ,
 .Xr kthread_create 9 ,
 .Xr pfind 9 ,
diff --git a/sys/sys/vmmeter.h b/sys/sys/vmmeter.h
index 8583aef0fe8..1e5cb6696c3 100644
--- a/sys/sys/vmmeter.h
+++ b/sys/sys/vmmeter.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmmeter.h,v 1.13 2012/04/12 12:33:03 deraadt Exp $	*/
+/*	$OpenBSD: vmmeter.h,v 1.14 2012/04/12 14:25:57 deraadt Exp $	*/
 /*	$NetBSD: vmmeter.h,v 1.9 1995/03/26 20:25:04 jtc Exp $	*/
 
 /*-
@@ -59,16 +59,16 @@ struct vmtotal {
 };
 
 /*
- * Fork/vfork/rfork accounting.
+ * Fork/vfork/__tfork accounting.
  */
 struct  forkstat {
 	int	cntfork;	/* number of fork() calls */
 	int	cntvfork;	/* number of vfork() calls */
-	int	cnttfork;	/* number of rfork() calls */
+	int	cnttfork;	/* number of __tfork() calls */
 	int	cntkthread;	/* number of kernel threads created */
 	int	sizfork;	/* VM pages affected by fork() */
 	int	sizvfork;	/* VM pages affected by vfork() */
-	int	siztfork;	/* VM pages affected by rfork() */
+	int	siztfork;	/* VM pages affected by __tfork() */
 	int	sizkthread;	/* VM pages affected by kernel threads */
 };