From owner-svn-src-all@FreeBSD.ORG  Fri Feb 13 02:10:10 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3EC48181;
 Fri, 13 Feb 2015 02:10:10 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2A1DEF95;
 Fri, 13 Feb 2015 02:10:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1D2AAYT050872;
 Fri, 13 Feb 2015 02:10:10 GMT (envelope-from gonzo@FreeBSD.org)
Received: (from gonzo@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1D2AAIG050871;
 Fri, 13 Feb 2015 02:10:10 GMT (envelope-from gonzo@FreeBSD.org)
Message-Id: <201502130210.t1D2AAIG050871@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gonzo set sender to
 gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Fri, 13 Feb 2015 02:10:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r278657 - head/sys/contrib/vchiq/interface/compat
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Feb 2015 02:10:10 -0000

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
  */