This commit was generated by cvs2svn to track changes on a CVS vendor

[unix-history] / sys / vm / vm_mmap.c

diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index ed5e78d..8a8e1ae 100644 (file)
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -37,7 +37,7 @@
  *
  *     from: Utah $Hdr: vm_mmap.c 1.3 90/01/21$
  *     from: @(#)vm_mmap.c     7.5 (Berkeley) 6/28/91
  *
  *     from: Utah $Hdr: vm_mmap.c 1.3 90/01/21$
  *     from: @(#)vm_mmap.c     7.5 (Berkeley) 6/28/91

- *     $Id: vm_mmap.c,v 1.18 1993/12/24 10:31:55 davidg Exp $
+ *     $Id: vm_mmap.c,v 1.20 1994/01/14 16:27:22 davidg Exp $

  */
 
 /*
  */
 
 /*


@@ -164,7 +164,7 @@ smmap(p, uap, retval)
         * Size is implicitly rounded to a page boundary.
         */
        addr = (vm_offset_t) uap->addr;
         * Size is implicitly rounded to a page boundary.
         */
        addr = (vm_offset_t) uap->addr;

-       if ((flags & MAP_FIXED) && (addr & page_mask) || uap->len < 0)
+       if ((flags & MAP_FIXED) && (addr & PAGE_MASK) || uap->len < 0)

                return(EINVAL);
        size = (vm_size_t) round_page(uap->len);
 
                return(EINVAL);
        size = (vm_size_t) round_page(uap->len);
 


@@ -286,7 +286,7 @@ msync(p, uap, retval)
                printf("msync(%d): addr %x len %x\n",
                       p->p_pid, uap->addr, uap->len);
 #endif
                printf("msync(%d): addr %x len %x\n",
                       p->p_pid, uap->addr, uap->len);
 #endif

-       if (((int)uap->addr & page_mask) || uap->len < 0)
+       if (((int)uap->addr & PAGE_MASK) || uap->len < 0)

                return(EINVAL);
        addr = oaddr = (vm_offset_t)uap->addr;
        osize = (vm_size_t)uap->len;
                return(EINVAL);
        addr = oaddr = (vm_offset_t)uap->addr;
        osize = (vm_size_t)uap->len;


@@ -358,7 +358,7 @@ munmap(p, uap, retval)
 #endif
 
        addr = (vm_offset_t) uap->addr;
 #endif
 
        addr = (vm_offset_t) uap->addr;

-       if ((addr & page_mask) || uap->len < 0)
+       if ((addr & PAGE_MASK) || uap->len < 0)

                return(EINVAL);
        size = (vm_size_t) round_page(uap->len);
        if (size == 0)
                return(EINVAL);
        size = (vm_size_t) round_page(uap->len);
        if (size == 0)


@@ -415,7 +415,7 @@ mprotect(p, uap, retval)
 #endif
 
        addr = (vm_offset_t) uap->addr;
 #endif
 
        addr = (vm_offset_t) uap->addr;

-       if ((addr & page_mask) || uap->len < 0)
+       if ((addr & PAGE_MASK) || uap->len < 0)

                return(EINVAL);
        size = (vm_size_t) uap->len;
        /*
                return(EINVAL);
        size = (vm_size_t) uap->len;
        /*


@@ -709,7 +709,7 @@ vm_mmap(map, addr, size, prot, maxprot, flags, handle, foff)
         * We only need to set max_protection in case it's
         * unequal to its default, which is VM_PROT_DEFAULT.
         */
         * We only need to set max_protection in case it's
         * unequal to its default, which is VM_PROT_DEFAULT.
         */

-       if(maxprot != VM_PROT_DEFAULT) {
+       if (maxprot != VM_PROT_DEFAULT) {

                rv = vm_map_protect(map, *addr, *addr+size, maxprot, TRUE);
                if (rv != KERN_SUCCESS) {
                        (void) vm_deallocate(map, *addr, size);
                rv = vm_map_protect(map, *addr, *addr+size, maxprot, TRUE);
                if (rv != KERN_SUCCESS) {
                        (void) vm_deallocate(map, *addr, size);