svn commit: r202544 - in user/kmacy/releng_8_rump/sys: sys vm

[Kip Macy]

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