From owner-svn-src-user@FreeBSD.ORG  Mon Jan 18 03:50:36 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 BD0D11065672;
	Mon, 18 Jan 2010 03:50:36 +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 AC3A48FC15;
	Mon, 18 Jan 2010 03:50:36 +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 o0I3oaKY039017;
	Mon, 18 Jan 2010 03:50:36 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0I3oarP039014;
	Mon, 18 Jan 2010 03:50:36 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201001180350.o0I3oarP039014@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 18 Jan 2010 03:50:36 +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: r202544 - in user/kmacy/releng_8_rump/sys: sys vm
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: Mon, 18 Jan 2010 03:50:36 -0000

Author: kmacy
Date: Mon Jan 18 03:50:36 2010
New Revision: 202544
URL: http://svn.freebsd.org/changeset/base/202544

Log:
  exclude malloc.h from uma in unet & add to mbuf.h

Modified:
  user/kmacy/releng_8_rump/sys/sys/mbuf.h
  user/kmacy/releng_8_rump/sys/vm/uma.h

Modified: user/kmacy/releng_8_rump/sys/sys/mbuf.h
==============================================================================
--- user/kmacy/releng_8_rump/sys/sys/mbuf.h	Mon Jan 18 03:49:13 2010	(r202543)
+++ user/kmacy/releng_8_rump/sys/sys/mbuf.h	Mon Jan 18 03:50:36 2010	(r202544)
@@ -39,6 +39,7 @@
 #ifdef _KERNEL
 #include <sys/systm.h>
 #include <vm/uma.h>
+#include <sys/malloc.h>
 #ifdef WITNESS
 #include <sys/lock.h>
 #endif

Modified: user/kmacy/releng_8_rump/sys/vm/uma.h
==============================================================================
--- user/kmacy/releng_8_rump/sys/vm/uma.h	Mon Jan 18 03:49:13 2010	(r202543)
+++ user/kmacy/releng_8_rump/sys/vm/uma.h	Mon Jan 18 03:50:36 2010	(r202544)
@@ -37,8 +37,9 @@
 #define VM_UMA_H
 
 #include <sys/param.h>		/* For NULL */
+#ifndef UNET
 #include <sys/malloc.h>		/* For M_* */
-
+#endif
 /* User visible parameters */
 #define UMA_SMALLEST_UNIT       (PAGE_SIZE / 256) /* Smallest item allocated */