From owner-svn-src-head@freebsd.org  Fri Feb 17 22:09:57 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2F6C3CE3EC0;
 Fri, 17 Feb 2017 22:09:57 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 E362118EA;
 Fri, 17 Feb 2017 22:09:56 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1HM9tFC037373;
 Fri, 17 Feb 2017 22:09:55 GMT (envelope-from mjg@FreeBSD.org)
Received: (from mjg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1HM9tl9037372;
 Fri, 17 Feb 2017 22:09:55 GMT (envelope-from mjg@FreeBSD.org)
Message-Id: <201702172209.v1HM9tl9037372@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org
 using -f
From: Mateusz Guzik <mjg@FreeBSD.org>
Date: Fri, 17 Feb 2017 22:09:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r313901 - head/sys/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Feb 2017 22:09:57 -0000

Author: mjg
Date: Fri Feb 17 22:09:55 2017
New Revision: 313901
URL: https://svnweb.freebsd.org/changeset/base/313901

Log:
  sx: fix mips builld after r313855
  
  The namespace in this file really needs cleaning up. In the meantime
  let inline primitives be defined as long as LOCK_DEBUG is not enabled.
  
  Reported by:	kib

Modified:
  head/sys/sys/sx.h

Modified: head/sys/sys/sx.h
==============================================================================
--- head/sys/sys/sx.h	Fri Feb 17 21:30:16 2017	(r313900)
+++ head/sys/sys/sx.h	Fri Feb 17 22:09:55 2017	(r313901)
@@ -145,7 +145,7 @@ struct sx_args {
  * deferred to 'tougher' functions.
  */
 
-#if	(LOCK_DEBUG == 0) && !defined(SX_NOINLINE)
+#if	(LOCK_DEBUG == 0)
 /* Acquire an exclusive lock. */
 static __inline int
 __sx_xlock(struct sx *sx, struct thread *td, int opts, const char *file,