lock_init => lockinit

[unix-history] / usr / src / sys / vm / vm_map.c

diff --git a/usr/src/sys/vm/vm_map.c b/usr/src/sys/vm/vm_map.c
index 41cab17..b2daa99 100644 (file)
--- a/usr/src/sys/vm/vm_map.c
+++ b/usr/src/sys/vm/vm_map.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vm_map.c    8.5 (Berkeley) %G%
+ *     @(#)vm_map.c    8.7 (Berkeley) %G%

  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.


@@ -237,7 +237,7 @@ vm_map_init(map, min, max, pageable)
        map->first_free = &map->header;
        map->hint = &map->header;
        map->timestamp = 0;
        map->first_free = &map->header;
        map->hint = &map->header;
        map->timestamp = 0;

-       lock_init(&map->lock, PVM, "thrd_sleep", 0, 0);
+       lockinit(&map->lock, PVM, "thrd_sleep", 0, 0);

        simple_lock_init(&map->ref_lock);
        simple_lock_init(&map->hint_lock);
 }
        simple_lock_init(&map->ref_lock);
        simple_lock_init(&map->hint_lock);
 }


@@ -1287,7 +1287,7 @@ vm_map_pageable(map, start, end, new_pageable)
                }
                else {
                    vm_map_set_recursive(&map->lock);
                }
                else {
                    vm_map_set_recursive(&map->lock);

-                   lockmgr(&map->lock, LK_DOWNGRADE, curproc);
+                   lockmgr(&map->lock, LK_DOWNGRADE, (void *)0, LOCKPID);

                }
 
                rv = 0;
                }
 
                rv = 0;


@@ -2392,7 +2392,8 @@ vm_map_lookup(var_map, vaddr, fault_type, out_entry,
                         *      share map to the new object.
                         */
 
                         *      share map to the new object.
                         */
 

-                       if (lockmgr(&share_map->lock, LK_EXCLUPGRADE, curproc)){
+                       if (lockmgr(&share_map->lock, LK_EXCLUPGRADE,
+                                   (void *)0, LOCKPID)) {

                                if (share_map != map)
                                        vm_map_unlock_read(map);
                                goto RetryLookup;
                                if (share_map != map)
                                        vm_map_unlock_read(map);
                                goto RetryLookup;


@@ -2405,7 +2406,8 @@ vm_map_lookup(var_map, vaddr, fault_type, out_entry,
                                
                        entry->needs_copy = FALSE;
                        
                                
                        entry->needs_copy = FALSE;
                        

-                       lockmgr(&share_map->lock, LK_DOWNGRADE, curproc);
+                       lockmgr(&share_map->lock, LK_DOWNGRADE,
+                               (void *)0, LOCKPID);

                }
                else {
                        /*
                }
                else {
                        /*


@@ -2422,7 +2424,8 @@ vm_map_lookup(var_map, vaddr, fault_type, out_entry,
         */
        if (entry->object.vm_object == NULL) {
 
         */
        if (entry->object.vm_object == NULL) {
 

-               if (lockmgr(&share_map->lock, LK_EXCLUPGRADE, curproc)) {
+               if (lockmgr(&share_map->lock, LK_EXCLUPGRADE,
+                               (void *)0, LOCKPID)) {

                        if (share_map != map)
                                vm_map_unlock_read(map);
                        goto RetryLookup;
                        if (share_map != map)
                                vm_map_unlock_read(map);
                        goto RetryLookup;


@@ -2431,7 +2434,7 @@ vm_map_lookup(var_map, vaddr, fault_type, out_entry,
                entry->object.vm_object = vm_object_allocate(
                                        (vm_size_t)(entry->end - entry->start));
                entry->offset = 0;
                entry->object.vm_object = vm_object_allocate(
                                        (vm_size_t)(entry->end - entry->start));
                entry->offset = 0;

-               lockmgr(&share_map->lock, LK_DOWNGRADE, curproc);
+               lockmgr(&share_map->lock, LK_DOWNGRADE, (void *)0, LOCKPID);

        }
 
        /*
        }
 
        /*