From cc6ec4528851e8e3e384776193fb955cd271b581 Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Wed, 26 Nov 1997 02:32:31 +0000
Subject: msync() has 3 args

---
 distrib/arc/common/rdsetroot.c              | 6 ++----
 distrib/common/rdsetroot.c                  | 8 ++------
 distrib/i386/floppies/common/rdsetroot.c    | 8 ++------
 distrib/mvme68k/common/rdsetroot.c          | 8 ++------
 distrib/pc532/floppies/inst-common/inject.c | 4 ++--
 distrib/powerpc/common/rdsetroot.c          | 6 ++----
 distrib/sun3/common/rdsetroot.c             | 8 ++------
 7 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/distrib/arc/common/rdsetroot.c b/distrib/arc/common/rdsetroot.c
index 4161293c4ef..f6fc1fad70b 100644
--- a/distrib/arc/common/rdsetroot.c
+++ b/distrib/arc/common/rdsetroot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rdsetroot.c,v 1.2 1997/05/18 13:40:47 pefo Exp $	*/
+/*	$OpenBSD: rdsetroot.c,v 1.3 1997/11/26 02:32:21 deraadt Exp $	*/
 /*	$NetBSD: rdsetroot.c,v 1.2 1995/10/13 16:38:39 gwr Exp $	*/
 
 /*
@@ -153,9 +153,7 @@ main(argc,argv)
 		exit(1);
 	}
 
-#if 0
-	msync(dataseg, mmap_size);
-#endif
+	msync(dataseg, mmap_size, 0);
 
 #ifdef	DEBUG
 	printf("...copied %d bytes\n", n);
diff --git a/distrib/common/rdsetroot.c b/distrib/common/rdsetroot.c
index a437a63a61b..b0e66677c72 100644
--- a/distrib/common/rdsetroot.c
+++ b/distrib/common/rdsetroot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rdsetroot.c,v 1.3 1997/05/16 20:59:45 niklas Exp $	*/
+/*	$OpenBSD: rdsetroot.c,v 1.4 1997/11/26 02:32:23 deraadt Exp $	*/
 /*	$NetBSD: rdsetroot.c,v 1.2 1995/10/13 16:38:39 gwr Exp $	*/
 
 /*
@@ -172,11 +172,7 @@ main(argc,argv)
 		exit(1);
 	}
 
-	msync(dataseg - data_pgoff, data_len
-#ifdef	sun
-		  ,0
-#endif
-		  );
+	msync(dataseg - data_pgoff, data_len, 0);
 
 #ifdef	DEBUG
 	printf("...copied %d bytes\n", n);
diff --git a/distrib/i386/floppies/common/rdsetroot.c b/distrib/i386/floppies/common/rdsetroot.c
index 5e43390413d..194dcf0b348 100644
--- a/distrib/i386/floppies/common/rdsetroot.c
+++ b/distrib/i386/floppies/common/rdsetroot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rdsetroot.c,v 1.1 1997/04/13 17:17:46 mickey Exp $	*/
+/*	$OpenBSD: rdsetroot.c,v 1.2 1997/11/26 02:32:24 deraadt Exp $	*/
 /*	$NetBSD: rdsetroot.c,v 1.2 1995/10/13 16:38:39 gwr Exp $	*/
 
 /*
@@ -162,11 +162,7 @@ main(argc,argv)
 		exit(1);
 	}
 
-	msync(dataseg - data_pgoff, data_len
-#ifdef	sun
-		  ,0
-#endif
-		  );
+	msync(dataseg - data_pgoff, data_len, 0);
 
 #ifdef	DEBUG
 	printf("...copied %d bytes\n", n);
diff --git a/distrib/mvme68k/common/rdsetroot.c b/distrib/mvme68k/common/rdsetroot.c
index 3ef17fc4091..317681f4d98 100644
--- a/distrib/mvme68k/common/rdsetroot.c
+++ b/distrib/mvme68k/common/rdsetroot.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: rdsetroot.c,v 1.1 1996/10/12 01:18:01 deraadt Exp $
+ *	$Id: rdsetroot.c,v 1.2 1997/11/26 02:32:25 deraadt Exp $
  */
 
 /*
@@ -163,11 +163,7 @@ main(argc,argv)
 		exit(1);
 	}
 
-	msync(dataseg - data_pgoff, data_len
-#ifdef	sun
-		  ,0
-#endif
-		  );
+	msync(dataseg - data_pgoff, data_len, 0);
 
 #ifdef	DEBUG
 	printf("...copied %d bytes\n", n);
diff --git a/distrib/pc532/floppies/inst-common/inject.c b/distrib/pc532/floppies/inst-common/inject.c
index 60d3eb01183..ea1a29df8ce 100644
--- a/distrib/pc532/floppies/inst-common/inject.c
+++ b/distrib/pc532/floppies/inst-common/inject.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: inject.c,v 1.2 1996/09/05 21:26:54 deraadt Exp $
+ *	$Id: inject.c,v 1.3 1997/11/26 02:32:27 deraadt Exp $
  */
 
 #include <stdio.h>
@@ -117,7 +117,7 @@ main(int argc, char **argv)
 	memcpy(ramdisk, filesys, filesyslen);
 
 	/* Sync vm/fs and unmap the images */
-	msync(kern, kernlen);
+	msync(kern, kernlen, 0);
 	munmap(kern, kernlen);
 	munmap(filesys, filesyslen);
 	exit(0);
diff --git a/distrib/powerpc/common/rdsetroot.c b/distrib/powerpc/common/rdsetroot.c
index 160ce12420a..14655750ab7 100644
--- a/distrib/powerpc/common/rdsetroot.c
+++ b/distrib/powerpc/common/rdsetroot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rdsetroot.c,v 1.1 1997/10/13 15:35:48 pefo Exp $	*/
+/*	$OpenBSD: rdsetroot.c,v 1.2 1997/11/26 02:32:28 deraadt Exp $	*/
 /*	$NetBSD: rdsetroot.c,v 1.2 1995/10/13 16:38:39 gwr Exp $	*/
 
 /*
@@ -153,9 +153,7 @@ main(argc,argv)
 		exit(1);
 	}
 
-#if 0
-	msync(dataseg, mmap_size);
-#endif
+	msync(dataseg, mmap_size, 0);
 
 #ifdef	DEBUG
 	printf("...copied %d bytes\n", n);
diff --git a/distrib/sun3/common/rdsetroot.c b/distrib/sun3/common/rdsetroot.c
index c9f47e56903..cda58d37a40 100644
--- a/distrib/sun3/common/rdsetroot.c
+++ b/distrib/sun3/common/rdsetroot.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: rdsetroot.c,v 1.2 1996/09/05 21:27:30 deraadt Exp $
+ *	$Id: rdsetroot.c,v 1.3 1997/11/26 02:32:30 deraadt Exp $
  */
 
 /*
@@ -163,11 +163,7 @@ main(argc,argv)
 		exit(1);
 	}
 
-	msync(dataseg - data_pgoff, data_len
-#ifdef	sun
-		  ,0
-#endif
-		  );
+	msync(dataseg - data_pgoff, data_len, 0);
 
 #ifdef	DEBUG
 	printf("...copied %d bytes\n", n);
-- 
cgit v1.2.3