From owner-svn-src-user@FreeBSD.ORG  Tue Jan  5 06:13:15 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8C63F106566C;
	Tue,  5 Jan 2010 06:13:15 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7B9468FC12;
	Tue,  5 Jan 2010 06:13:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o056DFYN009609;
	Tue, 5 Jan 2010 06:13:15 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o056DFgT009606;
	Tue, 5 Jan 2010 06:13:15 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201001050613.o056DFgT009606@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 5 Jan 2010 06:13:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r201558 - user/kmacy/releng_8_rump/lib/libunet
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jan 2010 06:13:15 -0000

Author: kmacy
Date: Tue Jan  5 06:13:15 2010
New Revision: 201558
URL: http://svn.freebsd.org/changeset/base/201558

Log:
  don't inline mutexes

Modified:
  user/kmacy/releng_8_rump/lib/libunet/Makefile
  user/kmacy/releng_8_rump/lib/libunet/unet_lock.c

Modified: user/kmacy/releng_8_rump/lib/libunet/Makefile
==============================================================================
--- user/kmacy/releng_8_rump/lib/libunet/Makefile	Tue Jan  5 06:03:17 2010	(r201557)
+++ user/kmacy/releng_8_rump/lib/libunet/Makefile	Tue Jan  5 06:13:15 2010	(r201558)
@@ -119,6 +119,7 @@ CFLAGS+=	-I./include
 CFLAGS+=	-I./include/opt
 CFLAGS+=	-I${PREFIX}
 CFLAGS+=	-D_KERNEL
+CFLAGS+=	-DMUTEX_NOINLINE
 CFLAGS+=	-DUNET
 CFLAGS+=	-DMAXUSERS=32
 CFLAGS+=	-fno-builtin

Modified: user/kmacy/releng_8_rump/lib/libunet/unet_lock.c
==============================================================================
--- user/kmacy/releng_8_rump/lib/libunet/unet_lock.c	Tue Jan  5 06:03:17 2010	(r201557)
+++ user/kmacy/releng_8_rump/lib/libunet/unet_lock.c	Tue Jan  5 06:13:15 2010	(r201558)
@@ -44,15 +44,14 @@ mtx_sysinit(void *arg)
 }
 
 void
-_mtx_lock_sleep(struct mtx *m, uintptr_t tid, int opts,
-    const char *file, int line)
+_mtx_lock_flags(struct mtx *m, int opts, const char *file, int line)
 {
 
 	panic("");
 }
 
 void
-_mtx_unlock_sleep(struct mtx *m, int opts, const char *file, int line)
+_mtx_unlock_flags(struct mtx *m, int opts, const char *file, int line)
 {
 
 	panic("");