diff options
| author | markj <markj@FreeBSD.org> | 2016-11-05 20:14:23 +0000 |
|---|---|---|
| committer | markj <markj@FreeBSD.org> | 2016-11-05 20:14:23 +0000 |
| commit | bdbbbb4c64014160ff10f8e2e5f52014385c22fa (patch) | |
| tree | 73142edcac9bff05801aed2a8edf1da5c8ee036b | |
| parent | 544e7c76e7ec877cfd8e2fe7560700e9f1fff447 (diff) | |
| download | FreeBSD-src-bdbbbb4c64014160ff10f8e2e5f52014385c22fa.zip FreeBSD-src-bdbbbb4c64014160ff10f8e2e5f52014385c22fa.tar.gz | |
MFC r304053, r304054:
Initialize busy lock state and strengthen busy lock assertions.
Tested by: Oliver Pinter
| -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 054148b..b688b56 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -1574,8 +1574,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, @@ -1887,7 +1886,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 f0e65bd..b6baf51 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -504,6 +504,7 @@ vm_phys_add_page(vm_paddr_t pa) 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); |
