From ee403b8a8ce84a0bb539f208b2db9f5f86a01751 Mon Sep 17 00:00:00 2001 From: jhb Date: Tue, 11 Feb 2014 22:05:21 +0000 Subject: [PATCH] Correct assertion to assert that the existing device VM object uses the same type rather than asserting in the case where we just created a new VM object. Reviewed by: kib --- sys/vm/device_pager.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c index 8113f0394b33..13491bab82b4 100644 --- a/sys/vm/device_pager.c +++ b/sys/vm/device_pager.c @@ -169,18 +169,20 @@ cdev_pager_allocate(void *handle, enum obj_type tp, struct cdev_pager_ops *ops, */ if (pindex > object->size) object->size = pindex; + KASSERT(object->type == tp, + ("Inconsistent device pager type %p %d", object, tp)); } else { object = object1; object1 = NULL; object->handle = handle; TAILQ_INSERT_TAIL(&dev_pager_object_list, object, pager_object_list); - KASSERT(object->type == tp, - ("Inconsistent device pager type %p %d", object, tp)); } } else { if (pindex > object->size) object->size = pindex; + KASSERT(object->type == tp, + ("Inconsistent device pager type %p %d", object, tp)); } mtx_unlock(&dev_pager_mtx); if (object1 != NULL) {