From 4faaa2fed9a8c8f0863872d018407fa9b6c86271 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Thu, 1 Mar 2007 09:46:46 +0000 Subject: 2007-03-01 Thomas Schwinge * linux/dev/glue/block.c (free_buffer): Use `VM_PAGE_FREE'. * vm/vm_object.c (vm_object_collapse, vm_object_page_remove) (vm_object_page_map): Likewise. --- vm/vm_object.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'vm/vm_object.c') diff --git a/vm/vm_object.c b/vm/vm_object.c index 5ffa021e..aac1c08d 100644 --- a/vm/vm_object.c +++ b/vm/vm_object.c @@ -2471,9 +2471,7 @@ void vm_object_collapse( if (p->offset < backing_offset || new_offset >= size) { - vm_page_lock_queues(); - vm_page_free(p); - vm_page_unlock_queues(); + VM_PAGE_FREE(p); } else { pp = vm_page_lookup(object, new_offset); if (pp != VM_PAGE_NULL && !pp->absent) { @@ -2482,9 +2480,7 @@ void vm_object_collapse( * Throw away the backing object's * page. */ - vm_page_lock_queues(); - vm_page_free(p); - vm_page_unlock_queues(); + VM_PAGE_FREE(p); } else { if (pp != VM_PAGE_NULL) { @@ -2508,9 +2504,7 @@ void vm_object_collapse( */ panic("vm_object_collapse: bad case"); - vm_page_lock_queues(); - vm_page_free(pp); - vm_page_unlock_queues(); + VM_PAGE_FREE(pp); /* * Fall through to move the backing @@ -2755,9 +2749,7 @@ void vm_object_page_remove( if (!p->fictitious) pmap_page_protect(p->phys_addr, VM_PROT_NONE); - vm_page_lock_queues(); - vm_page_free(p); - vm_page_unlock_queues(); + VM_PAGE_FREE(p); } } } else { @@ -2770,9 +2762,7 @@ void vm_object_page_remove( if (!p->fictitious) pmap_page_protect(p->phys_addr, VM_PROT_NONE); - vm_page_lock_queues(); - vm_page_free(p); - vm_page_unlock_queues(); + VM_PAGE_FREE(p); } p = next; } @@ -2941,9 +2931,7 @@ vm_object_page_map( if ((old_page = vm_page_lookup(object, offset)) != VM_PAGE_NULL) { - vm_page_lock_queues(); - vm_page_free(old_page); - vm_page_unlock_queues(); + VM_PAGE_FREE(old_page); } vm_page_init(m, addr); -- cgit v1.2.3