Index: include/mutex.h =================================================================== RCS file: /cvs/src/sys/arch/i386/include/mutex.h,v retrieving revision 1.7 diff -u -p -r1.7 mutex.h --- include/mutex.h 29 Mar 2014 18:09:29 -0000 1.7 +++ include/mutex.h 2 Jul 2015 09:51:48 -0000 @@ -58,14 +58,12 @@ void __mtx_init(struct mutex *, int); #define mtx_init(mtx, ipl) __mtx_init((mtx), __MUTEX_IPL((ipl))) #define MUTEX_ASSERT_LOCKED(mtx) do { \ - if ((mtx)->mtx_lock != 1 || \ - (mtx)->mtx_owner != curcpu()) \ + if ((mtx)->mtx_owner != curcpu()) \ panic("mutex %p not held in %s", (mtx), __func__); \ } while (0) #define MUTEX_ASSERT_UNLOCKED(mtx) do { \ - if ((mtx)->mtx_lock == 1 && \ - (mtx)->mtx_owner == curcpu()) \ + if ((mtx)->mtx_owner == curcpu()) \ panic("mutex %p held in %s", (mtx), __func__); \ } while (0)