Author: gonzo
Date: Fri Feb 13 02:10:09 2015
New Revision: 278657
URL: https://svnweb.freebsd.org/changeset/base/278657
Log:
Fix build without INVARIANTS/INVARIANT_SUPPORT:
- Replace "emulation" of return in lmutex_lock_interruptible macros by
proper static/inline function.
Submitted by: Guy Yur
Modified:
head/sys/contrib/vchiq/interface/compat/vchi_bsd.h
Modified: head/sys/contrib/vchiq/interface/compat/vchi_bsd.h
==============================================================================
--- head/sys/contrib/vchiq/interface/compat/vchi_bsd.h Fri Feb 13 02:02:12
2015 (r278656)
+++ head/sys/contrib/vchiq/interface/compat/vchi_bsd.h Fri Feb 13 02:10:09
2015 (r278657)
@@ -151,10 +151,16 @@ struct mutex {
#define lmutex_init(lock) mtx_init(&(lock)->mtx, #lock, NULL,
MTX_DEF)
#define lmutex_lock(lock) mtx_lock(&(lock)->mtx)
-#define lmutex_lock_interruptible(lock) (mtx_lock(&(lock)->mtx),0)
#define lmutex_unlock(lock) mtx_unlock(&(lock)->mtx)
#define lmutex_destroy(lock) mtx_destroy(&(lock)->mtx)
+static __inline int
+lmutex_lock_interruptible(struct mutex *lock)
+{
+ mtx_lock(&(lock)->mtx);
+ return 0;
+}
+
/*
* Rwlock API
*/
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
