From owner-svn-src-user@FreeBSD.ORG  Tue Jan  5 05:45:52 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 0748D106566B;
	Tue,  5 Jan 2010 05:45:52 +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 EB19C8FC15;
	Tue,  5 Jan 2010 05:45:51 +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 o055jpLa003360;
	Tue, 5 Jan 2010 05:45:51 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o055jprg003358;
	Tue, 5 Jan 2010 05:45:51 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201001050545.o055jprg003358@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 5 Jan 2010 05:45:51 +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: r201554 - user/kmacy/releng_8_rump/sys/sys
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 05:45:52 -0000

Author: kmacy
Date: Tue Jan  5 05:45:51 2010
New Revision: 201554
URL: http://svn.freebsd.org/changeset/base/201554

Log:
  prefix malloc and free with unet_ if UNET is defined

Modified:
  user/kmacy/releng_8_rump/sys/sys/malloc.h

Modified: user/kmacy/releng_8_rump/sys/sys/malloc.h
==============================================================================
--- user/kmacy/releng_8_rump/sys/sys/malloc.h	Tue Jan  5 05:44:52 2010	(r201553)
+++ user/kmacy/releng_8_rump/sys/sys/malloc.h	Tue Jan  5 05:45:51 2010	(r201554)
@@ -39,6 +39,11 @@
 #include <sys/queue.h>
 #include <sys/_lock.h>
 #include <sys/_mutex.h>
+#ifdef UNET
+#define	malloc	unet_malloc
+#define	free	unet_free
+#endif
+
 
 #define	MINALLOCSIZE	UMA_SMALLEST_UNIT