OpenBSD -> NetBSD where previously missed.

6 files changed, 28 insertions, 28 deletions

diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c
index 6ba4c31a411..098e6412d46 100644
--- a/sys/compat/linux/linux_ioctl.c
+++ b/sys/compat/linux/linux_ioctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_ioctl.c,v 1.7 1998/04/26 21:22:22 provos Exp $	*/
+/*	$OpenBSD: linux_ioctl.c,v 1.8 2000/07/23 22:35:38 jasoni Exp $	*/
 /*	$NetBSD: linux_ioctl.c,v 1.14 1996/04/05 00:01:28 christos Exp $	*/
 
 /*
@@ -53,7 +53,7 @@
 #define LINUX_TO_OSS(v) (v)	/* do nothing, same ioctl() encoding */
 
 /*
- * Most ioctl command are just converted to their NetBSD values,
+ * Most ioctl command are just converted to their OpenBSD values,
  * and passed on. The ones that take structure pointers and (flag)
  * values need some massaging. This is done the usual way by
  * allocating stackgap memory, letting the actual ioctl call do its
diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c
index 4c38ddac51c..9e184933001 100644
--- a/sys/compat/linux/linux_ipc.c
+++ b/sys/compat/linux/linux_ipc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_ipc.c,v 1.4 1997/11/26 09:17:41 deraadt Exp $	*/
+/*	$OpenBSD: linux_ipc.c,v 1.5 2000/07/23 22:35:38 jasoni Exp $	*/
 /*	$NetBSD: linux_ipc.c,v 1.10 1996/04/05 00:01:44 christos Exp $	*/
 
 /*
@@ -161,7 +161,7 @@ linux_sys_ipc(p, v, retval)
 
 #if defined(SYSVMSG) || defined(SYSVSEM) || defined(SYSVSHM)
 /*
- * Convert between Linux and NetBSD ipc_perm structures. Only the
+ * Convert between Linux and OpenBSD ipc_perm structures. Only the
  * order of the fields is different.
  */
 void
@@ -202,7 +202,7 @@ bsd_to_linux_ipc_perm(bpp, lpp)
  */
 
 /*
- * Convert between Linux and NetBSD semid_ds structures.
+ * Convert between Linux and OpenBSD semid_ds structures.
  */
 void
 bsd_to_linux_semid_ds(bs, ls)
@@ -600,7 +600,7 @@ linux_shmget(p, uap, retval)
 }
 
 /*
- * Convert between Linux and NetBSD shmid_ds structures.
+ * Convert between Linux and OpenBSD shmid_ds structures.
  * The order of the fields is once again the difference, and
  * we also need a place to store the internal data pointer
  * in, which is unfortunately stored in this structure.
@@ -644,7 +644,7 @@ bsd_to_linux_shmid_ds(bsp, lsp)
 /*
  * shmctl. Not implemented (for now): IPC_INFO, SHM_INFO, SHM_STAT
  * SHM_LOCK and SHM_UNLOCK are passed on, but currently not implemented
- * by NetBSD itself.
+ * by OpenBSD itself.
  *
  * The usual structure conversion and massaging is done.
  */
diff --git a/sys/compat/linux/linux_ipc.h b/sys/compat/linux/linux_ipc.h
index 963f437b2f6..c98730cd923 100644
--- a/sys/compat/linux/linux_ipc.h
+++ b/sys/compat/linux/linux_ipc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_ipc.h,v 1.2 1996/04/17 05:23:53 mickey Exp $	*/
+/*	$OpenBSD: linux_ipc.h,v 1.3 2000/07/23 22:35:38 jasoni Exp $	*/
 /*	$NetBSD: linux_ipc.h,v 1.1 1995/02/28 23:25:47 fvdl Exp $	*/
 
 /*
@@ -37,7 +37,7 @@
 
 /*
  * Structs and values to handle the SYSV ipc/shm/msg calls implemented
- * in Linux. Most values match the NetBSD values (as they are both derived
+ * in Linux. Most values match the OpenBSD values (as they are both derived
  * from SysV values). Values that are the same may not be defined here.
  */
 
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index d279dc10e26..fe78c9fe6dd 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_misc.c,v 1.30 2000/07/17 05:45:34 art Exp $	*/
+/*	$OpenBSD: linux_misc.c,v 1.31 2000/07/23 22:35:38 jasoni Exp $	*/
 /*	$NetBSD: linux_misc.c,v 1.27 1996/05/20 01:59:21 fvdl Exp $	*/
 
 /*
@@ -102,8 +102,8 @@ bsd_to_linux_wstat(status)
 }
 
 /*
- * waitpid(2). Passed on to the NetBSD call, surrounded by code to
- * reserve some space for a NetBSD-style wait status, and converting
+ * waitpid(2). Passed on to the OpenBSD call, surrounded by code to
+ * reserve some space for a OpenBSD-style wait status, and converting
  * it to what Linux wants.
  */
 int
@@ -214,7 +214,7 @@ linux_sys_setresgid(p, v, retval)
 	sgid = SCARG(uap, sgid);
 
 	/*
-	 * Note: These checks are a little different than the NetBSD
+	 * Note: These checks are a little different than the OpenBSD
 	 * setregid(2) call performs.  This precisely follows the
 	 * behavior of the Linux kernel.
 	 */
@@ -241,7 +241,7 @@ linux_sys_setresgid(p, v, retval)
 
 	/*
 	 * Now assign the real, effective, and saved GIDs.
-	 * Note that Linux, unlike NetBSD in setregid(2), does not
+	 * Note that Linux, unlike OpenBSD in setregid(2), does not
 	 * set the saved UID in this call unless the user specifies
 	 * it.
 	 */
@@ -314,7 +314,7 @@ linux_sys_break(p, v, retval)
 
 /*
  * Linux brk(2). The check if the new address is >= the old one is
- * done in the kernel in Linux. NetBSD does it in the library.
+ * done in the kernel in Linux. OpenBSD does it in the library.
  */
 int
 linux_sys_brk(p, v, retval)
@@ -494,7 +494,7 @@ linux_sys_fstatfs(p, v, retval)
 /*
  * uname(). Just copy the info from the various strings stored in the
  * kernel, and put it in the Linux utsname structure. That structure
- * is almost the same as the NetBSD one, only it has fields 65 characters
+ * is almost the same as the OpenBSD one, only it has fields 65 characters
  * long, and an extra domainname field.
  */
 int
@@ -725,7 +725,7 @@ linux_sys_times(p, v, retval)
 }
 
 /*
- * NetBSD passes fd[0] in retval[0], and fd[1] in retval[1].
+ * OpenBSD passes fd[0] in retval[0], and fd[1] in retval[1].
  * Linux directly passes the pointer.
  */
 int
@@ -771,7 +771,7 @@ linux_sys_pipe(p, v, retval)
 }
 
 /*
- * Alarm. This is a libc call which uses setitimer(2) in NetBSD.
+ * Alarm. This is a libc call which uses setitimer(2) in OpenBSD.
  * Fiddle with the timers to make it work.
  */
 int
@@ -1363,7 +1363,7 @@ linux_sys_setresuid(p, v, retval)
 	suid = SCARG(uap, suid);
 
 	/*
-	 * Note: These checks are a little different than the NetBSD
+	 * Note: These checks are a little different than the OpenBSD
 	 * setreuid(2) call performs.  This precisely follows the
 	 * behavior of the Linux kernel.
 	 */
@@ -1390,7 +1390,7 @@ linux_sys_setresuid(p, v, retval)
 
 	/*
 	 * Now assign the new real, effective, and saved UIDs.
-	 * Note that Linux, unlike NetBSD in setreuid(2), does not
+	 * Note that Linux, unlike OpenBSD in setreuid(2), does not
 	 * set the saved UID in this call unless the user specifies
 	 * it.
 	 */
diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c
index a8d7febecd5..1810d227a40 100644
--- a/sys/compat/linux/linux_socket.c
+++ b/sys/compat/linux/linux_socket.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_socket.c,v 1.17 1999/02/10 08:04:26 deraadt Exp $	*/
+/*	$OpenBSD: linux_socket.c,v 1.18 2000/07/23 22:35:38 jasoni Exp $	*/
 /*	$NetBSD: linux_socket.c,v 1.14 1996/04/05 00:01:50 christos Exp $	*/
 
 /*
@@ -625,7 +625,7 @@ linux_shutdown(p, uap, retval)
 }
 
 /*
- * Convert socket option level from Linux to NetBSD value. Only SOL_SOCKET
+ * Convert socket option level from Linux to OpenBSD value. Only SOL_SOCKET
  * is different, the rest matches IPPROTO_* on both systems.
  */
 int
@@ -648,7 +648,7 @@ linux_to_bsd_sopt_level(llevel)
 }
 
 /*
- * Convert Linux socket level socket option numbers to NetBSD values.
+ * Convert Linux socket level socket option numbers to OpenBSD values.
  */
 int
 linux_to_bsd_so_sockopt(lopt)
@@ -686,7 +686,7 @@ linux_to_bsd_so_sockopt(lopt)
 }
 
 /*
- * Convert Linux IP level socket option number to NetBSD values.
+ * Convert Linux IP level socket option number to OpenBSD values.
  */
 int
 linux_to_bsd_ip_sockopt(lopt)
@@ -716,7 +716,7 @@ linux_to_bsd_ip_sockopt(lopt)
 }
 
 /*
- * Convert Linux TCP level socket option number to NetBSD values.
+ * Convert Linux TCP level socket option number to OpenBSD values.
  */
 int
 linux_to_bsd_tcp_sockopt(lopt)
@@ -734,7 +734,7 @@ linux_to_bsd_tcp_sockopt(lopt)
 }
 
 /*
- * Convert Linux UDP level socket option number to NetBSD values.
+ * Convert Linux UDP level socket option number to OpenBSD values.
  */
 int
 linux_to_bsd_udp_sockopt(lopt)
diff --git a/sys/compat/linux/linux_socket.h b/sys/compat/linux/linux_socket.h
index 5bf7e913afb..15cecffd8da 100644
--- a/sys/compat/linux/linux_socket.h
+++ b/sys/compat/linux/linux_socket.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_socket.h,v 1.4 1997/12/14 20:51:16 deraadt Exp $	*/
+/*	$OpenBSD: linux_socket.h,v 1.5 2000/07/23 22:35:38 jasoni Exp $	*/
 /*	$NetBSD: linux_socket.h,v 1.3 1995/05/28 10:16:34 mycroft Exp $	*/
 
 /*
@@ -37,7 +37,7 @@
 
 /*
  * Various Linux socket defines. Everything that is not re-defined here
- * is the same as in NetBSD.
+ * is the same as in OpenBSD.
  *
  * COMPAT_43 is assumed, and the osockaddr struct is used (it is what
  * Linux uses)