BSD 4_4 release

[unix-history] / usr / src / sys / i386 / i386 / mem.c

diff --git a/usr/src/sys/i386/i386/mem.c b/usr/src/sys/i386/i386/mem.c
index b2fcae7..ab69926 100644 (file)
--- a/usr/src/sys/i386/i386/mem.c
+++ b/usr/src/sys/i386/i386/mem.c
@@ -1,36 +1,62 @@
 /*-
  * Copyright (c) 1988 University of Utah.
 /*-
  * Copyright (c) 1988 University of Utah.

- * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1982, 1986, 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department, and code derived from software contributed to
  * Berkeley by William Jolitz.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department, and code derived from software contributed to
  * Berkeley by William Jolitz.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  *
  * from: Utah $Hdr: mem.c 1.13 89/10/08$
  *
  * from: Utah $Hdr: mem.c 1.13 89/10/08$

- *     @(#)mem.c       7.5 (Berkeley) %G%
+ *     @(#)mem.c       8.1 (Berkeley) 6/11/93

  */
 
 /*
  * Memory special file
  */
 
  */
 
 /*
  * Memory special file
  */
 

-#include "param.h"
-#include "conf.h"
-#include "buf.h"
-#include "systm.h"
-#include "uio.h"
-#include "malloc.h"
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/buf.h>
+#include <sys/systm.h>
+#include <sys/uio.h>
+#include <sys/malloc.h>

 
 

-#include "machine/cpu.h"
+#include <machine/cpu.h>

 
 

-#include "vm/vm_param.h"
-#include "vm/lock.h"
-#include "vm/vm_prot.h"
-#include "vm/pmap.h"
+#include <vm/vm_param.h>
+#include <vm/lock.h>
+#include <vm/vm_prot.h>
+#include <vm/pmap.h>

 
 extern        char *vmmap;            /* poor name! */
 /*ARGSUSED*/
 
 extern        char *vmmap;            /* poor name! */
 /*ARGSUSED*/


@@ -64,8 +90,8 @@ mmrw(dev, uio, flags)
                                TRUE);
                        o = (int)uio->uio_offset & PGOFSET;
                        c = (u_int)(NBPG - ((int)iov->iov_base & PGOFSET));
                                TRUE);
                        o = (int)uio->uio_offset & PGOFSET;
                        c = (u_int)(NBPG - ((int)iov->iov_base & PGOFSET));

-                       c = MIN(c, (u_int)(NBPG - o));
-                       c = MIN(c, (u_int)iov->iov_len);
+                       c = min(c, (u_int)(NBPG - o));
+                       c = min(c, (u_int)iov->iov_len);

                        error = uiomove((caddr_t)&vmmap[o], (int)c, uio);
                        pmap_remove(kernel_pmap, vmmap, &vmmap[NBPG]);
                        continue;
                        error = uiomove((caddr_t)&vmmap[o], (int)c, uio);
                        pmap_remove(kernel_pmap, vmmap, &vmmap[NBPG]);
                        continue;


@@ -97,7 +123,7 @@ mmrw(dev, uio, flags)
                                    malloc(CLBYTES, M_TEMP, M_WAITOK);
                                bzero(zbuf, CLBYTES);
                        }
                                    malloc(CLBYTES, M_TEMP, M_WAITOK);
                                bzero(zbuf, CLBYTES);
                        }

-                       c = MIN(iov->iov_len, CLBYTES);
+                       c = min(iov->iov_len, CLBYTES);

                        error = uiomove(zbuf, (int)c, uio);
                        continue;
 
                        error = uiomove(zbuf, (int)c, uio);
                        continue;