From 3162ff437e3400b7d8ed50f5e4cddf298e374c84 Mon Sep 17 00:00:00 2001 From: kib Date: Wed, 27 May 2015 08:30:16 +0000 Subject: MFC r283162: Set VPO_UNMANAGED on the freed page when insertion of the page into the object queue failed, to satisfy the assertion. MFC r283163: Do grammar fix in the comment to record the right commit message for r283162. --- sys/vm/vm_page.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sys/vm') diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index ab3bd5e..8024a7c 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -1639,6 +1639,7 @@ vm_page_alloc(vm_object_t object, vm_pindex_t pindex, int req) m->wire_count = 0; } m->object = NULL; + m->oflags = VPO_UNMANAGED; vm_page_free(m); return (NULL); } @@ -3037,8 +3038,8 @@ vm_page_zero_invalid(vm_page_t m, boolean_t setvalid) VM_OBJECT_ASSERT_WLOCKED(m->object); /* * Scan the valid bits looking for invalid sections that - * must be zerod. Invalid sub-DEV_BSIZE'd areas ( where the - * valid bit may be set ) have already been zerod by + * must be zeroed. Invalid sub-DEV_BSIZE'd areas ( where the + * valid bit may be set ) have already been zeroed by * vm_page_set_validclean(). */ for (b = i = 0; i <= PAGE_SIZE / DEV_BSIZE; ++i) { -- cgit v1.1