d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unspammed nested include of <sys/malloc.h>. <sys/mbuf.h> hasn't

Browse Source 
really used any features from <sys/malloc.h> since it was "blasted
from the past" in rev.1.15, and most .c files did not depend on
the namespace pollution (others have been fixed).  The mbuf allocation
control values M_DONTWAIT and M_WAIT were just defined in terms of
the malloc control values M_NOWAIT and M_WAITOK.  The mbuf values
are now defined directly.
This commit is contained in:
Bruce Evans 1997-12-28 01:04:47 +00:00
parent 64cfdf460e
commit e8934daf9a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=32037
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/sys/mbuf.h
View File

@ -31,16 +31,12 @@
* SUCH DAMAGE.
*
* @(#)mbuf.h 8.5 (Berkeley) 2/19/95
* $Id: mbuf.h,v 1.24 1997/10/10 18:15:46 phk Exp $
* $Id: mbuf.h,v 1.25 1997/10/12 20:26:00 phk Exp $
*/
#ifndef _SYS_MBUF_H_
#define _SYS_MBUF_H_
#ifndef M_WAITOK
#include <sys/malloc.h>
#endif
/*
* Mbufs are of a single size, MSIZE (machine/machparam.h), which
* includes overhead. An mbuf may add a single "mbuf cluster" of size
@ -149,8 +145,8 @@ struct mbuf {
#define MT_OOBDATA 15 /* expedited data */
/* flags to m_get/MGET */
#define M_DONTWAIT M_NOWAIT
#define M_WAIT M_WAITOK
#define M_DONTWAIT 1
#define M_WAIT 0
/* Freelists:
*
@ -416,7 +412,6 @@ int m_clalloc __P((int, int));
void m_copyback __P((struct mbuf *, int, int, caddr_t));
void m_copydata __P((struct mbuf *,int,int,caddr_t));
void m_freem __P((struct mbuf *));
#endif /* KERNEL */
#endif /* !_SYS_MBUF_H_ */