diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | linux/dev/glue/block.c | 4 | ||||
| -rw-r--r-- | vm/vm_object.c | 24 |
3 files changed, 16 insertions, 24 deletions
@@ -1,14 +1,20 @@ +2007-03-01 Thomas Schwinge <tschwinge@gnu.org> + + * 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. + 2007-02-20 Samuel Thibault <samuel.thibault@ens-lyon.org> + * linux/dev/glue/block.c (free_buffer): Fix + vm_page_lock_queues/vm_page_unlock_queues pair. + Fix ddb's trace command. * i386/i386/db_trace.c (db_find_trace_symbols): Drop _ prefix on ELF targets. (db_i386_stack_trace): Check that adresses of known functions were really found. - * linux/dev/glue/block.c (free_buffer): Fix - vm_page_lock_queues/vm_page_unlock_queues pair. - 2007-02-19 Thomas Schwinge <tschwinge@gnu.org> * Makefile.am (gnumach_LINKFLAGS): New variable. diff --git a/linux/dev/glue/block.c b/linux/dev/glue/block.c index cf2a53c..48dba7d 100644 --- a/linux/dev/glue/block.c +++ b/linux/dev/glue/block.c @@ -337,9 +337,7 @@ free_buffer (void *p, int size) if (m->phys_addr == (vm_offset_t) p) { queue_remove (&d->pages, m, vm_page_t, pageq); - vm_page_lock_queues (); - vm_page_free (m); - vm_page_unlock_queues (); + VM_PAGE_FREE (m); return; } } diff --git a/vm/vm_object.c b/vm/vm_object.c index 5ffa021..aac1c08 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); |