diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index c819ba186111..39822ea3f158 100644
--- a/sys/kern/kern_lock.c
+++ b/sys/kern/kern_lock.c
@@ -335,8 +335,12 @@ debuglockmgr(lkp, flags, interlkp, td, name, file, line)
 			error = acquire(&lkp, extflags, LK_SHARE_NONZERO);
 			lkp->lk_flags &= ~LK_WANT_UPGRADE;
 
-			if (error)
-				break;
+			if (error) {
+			         if ((lkp->lk_flags & ( LK_WANT_EXCL | LK_WAIT_NONZERO)) == (LK_WANT_EXCL | LK_WAIT_NONZERO))
+			                   wakeup((void *)lkp);
+			         break;
+			}
+
 			lkp->lk_flags |= LK_HAVE_EXCL;
 			lkp->lk_lockholder = thr;
 			if (lkp->lk_exclusivecount != 0)
@@ -389,10 +393,13 @@ debuglockmgr(lkp, flags, interlkp, td, name, file, line)
 		/*
 		 * Wait for shared locks and upgrades to finish.
 		 */
-		error = acquire(&lkp, extflags, LK_WANT_UPGRADE | LK_SHARE_NONZERO);
+		error = acquire(&lkp, extflags, LK_HAVE_EXCL | LK_WANT_UPGRADE | LK_SHARE_NONZERO);
 		lkp->lk_flags &= ~LK_WANT_EXCL;
-		if (error)
+		if (error) {
+			if (lkp->lk_flags & LK_WAIT_NONZERO)		
+			         wakeup((void *)lkp);
 			break;
+		}	
 		lkp->lk_flags |= LK_HAVE_EXCL;
 		lkp->lk_lockholder = thr;
 		if (lkp->lk_exclusivecount != 0)