diff options
| author | markj <markj@FreeBSD.org> | 2016-08-31 21:14:16 +0000 |
|---|---|---|
| committer | markj <markj@FreeBSD.org> | 2016-08-31 21:14:16 +0000 |
| commit | 44bd04a230cda020a1f43b8ffed6409eeb813a2f (patch) | |
| tree | b8d974efb9c1eef74c809d7c3a6ddadf72867b36 /sys/vm | |
| parent | b8b74f1267f36d52649fb37d1454eb5d6e097c1c (diff) | |
| download | FreeBSD-src-44bd04a230cda020a1f43b8ffed6409eeb813a2f.zip FreeBSD-src-44bd04a230cda020a1f43b8ffed6409eeb813a2f.tar.gz | |
MFC r304053, r304054:
Initialize busy lock state and strengthen busy lock assertions.
Diffstat (limited to 'sys/vm')
| -rw-r--r-- | sys/vm/vm_page.c | 5 | ||||
| -rw-r--r-- | sys/vm/vm_phys.c | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index c37ae13..b64e911 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -1712,8 +1712,7 @@ vm_page_alloc(vm_object_t object, vm_pindex_t pindex, int req) ("vm_page_alloc: page %p has unexpected queue %d", m, m->queue)); KASSERT(m->wire_count == 0, ("vm_page_alloc: page %p is wired", m)); KASSERT(m->hold_count == 0, ("vm_page_alloc: page %p is held", m)); - KASSERT(!vm_page_sbusied(m), - ("vm_page_alloc: page %p is busy", m)); + KASSERT(!vm_page_busied(m), ("vm_page_alloc: page %p is busy", m)); KASSERT(m->dirty == 0, ("vm_page_alloc: page %p is dirty", m)); KASSERT(pmap_page_get_memattr(m) == VM_MEMATTR_DEFAULT, ("vm_page_alloc: page %p has unexpected memattr %d", m, @@ -2021,7 +2020,7 @@ vm_page_alloc_init(vm_page_t m) ("vm_page_alloc_init: page %p is wired", m)); KASSERT(m->hold_count == 0, ("vm_page_alloc_init: page %p is held", m)); - KASSERT(!vm_page_sbusied(m), + KASSERT(!vm_page_busied(m), ("vm_page_alloc_init: page %p is busy", m)); KASSERT(m->dirty == 0, ("vm_page_alloc_init: page %p is dirty", m)); diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index 0b42a5e..ab48f58 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -741,6 +741,7 @@ vm_phys_add_page(vm_paddr_t pa) vm_cnt.v_page_count++; m = vm_phys_paddr_to_vm_page(pa); + m->busy_lock = VPB_UNBUSIED; m->phys_addr = pa; m->queue = PQ_NONE; m->segind = vm_phys_paddr_to_segind(pa); |
