diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2014-08-18 05:11:04 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2014-08-18 05:11:04 +0000 |
| commit | 1f9d49e4b6bac3b7cc8f73f8a9b741900e73c475 (patch) | |
| tree | b42683c8241c280a0fc2390df6176abe64e89934 /sys | |
| parent | 568267eb716343d8d7a5eb85d184f643cb2d23a3 (diff) | |
dont rely on mbuf.h to provide pool.h.
ok miod@, who has offerred to help with any MD fallout
ok guenther@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/amd64/aesni.c | 3 | ||||
| -rw-r--r-- | sys/arch/hppa/hppa/machdep.c | 4 | ||||
| -rw-r--r-- | sys/arch/hppa64/hppa64/machdep.c | 4 | ||||
| -rw-r--r-- | sys/crypto/cryptodev.c | 3 | ||||
| -rw-r--r-- | sys/dev/pci/if_myx.c | 3 | ||||
| -rw-r--r-- | sys/kern/kern_sysctl.c | 3 | ||||
| -rw-r--r-- | sys/kern/uipc_mbuf2.c | 3 | ||||
| -rw-r--r-- | sys/sys/mbuf.h | 3 |
8 files changed, 15 insertions, 11 deletions
diff --git a/sys/arch/amd64/amd64/aesni.c b/sys/arch/amd64/amd64/aesni.c index a107ef602a5..36be2dfac24 100644 --- a/sys/arch/amd64/amd64/aesni.c +++ b/sys/arch/amd64/amd64/aesni.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aesni.c,v 1.27 2014/07/12 18:44:41 tedu Exp $ */ +/* $OpenBSD: aesni.c,v 1.28 2014/08/18 05:11:03 dlg Exp $ */ /*- * Copyright (c) 2003 Jason Wright * Copyright (c) 2003, 2004 Theo de Raadt @@ -24,6 +24,7 @@ #include <sys/queue.h> #include <sys/types.h> #include <sys/malloc.h> +#include <sys/pool.h> #include <sys/mbuf.h> #include <sys/pool.h> diff --git a/sys/arch/hppa/hppa/machdep.c b/sys/arch/hppa/hppa/machdep.c index 39a79d64c62..11793d2b592 100644 --- a/sys/arch/hppa/hppa/machdep.c +++ b/sys/arch/hppa/hppa/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.233 2014/07/22 01:04:04 uebayasi Exp $ */ +/* $OpenBSD: machdep.c,v 1.234 2014/08/18 05:11:03 dlg Exp $ */ /* * Copyright (c) 1999-2003 Michael Shalayeff @@ -38,7 +38,7 @@ #include <sys/file.h> #include <sys/timeout.h> #include <sys/malloc.h> -#include <sys/mbuf.h> +#include <sys/pool.h> #include <sys/msgbuf.h> #include <sys/ioctl.h> #include <sys/tty.h> diff --git a/sys/arch/hppa64/hppa64/machdep.c b/sys/arch/hppa64/hppa64/machdep.c index 9e074884364..79a7d228c4a 100644 --- a/sys/arch/hppa64/hppa64/machdep.c +++ b/sys/arch/hppa64/hppa64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.71 2014/07/22 01:04:04 uebayasi Exp $ */ +/* $OpenBSD: machdep.c,v 1.72 2014/08/18 05:11:03 dlg Exp $ */ /* * Copyright (c) 2005 Michael Shalayeff @@ -29,7 +29,7 @@ #include <sys/file.h> #include <sys/timeout.h> #include <sys/malloc.h> -#include <sys/mbuf.h> +#include <sys/pool.h> #include <sys/msgbuf.h> #include <sys/ioctl.h> #include <sys/tty.h> diff --git a/sys/crypto/cryptodev.c b/sys/crypto/cryptodev.c index 67713ae0f91..b704aac2123 100644 --- a/sys/crypto/cryptodev.c +++ b/sys/crypto/cryptodev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cryptodev.c,v 1.81 2014/07/12 18:50:00 tedu Exp $ */ +/* $OpenBSD: cryptodev.c,v 1.82 2014/08/18 05:11:03 dlg Exp $ */ /* * Copyright (c) 2001 Theo de Raadt @@ -33,6 +33,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> +#include <sys/pool.h> #include <sys/mbuf.h> #include <sys/proc.h> #include <sys/file.h> diff --git a/sys/dev/pci/if_myx.c b/sys/dev/pci/if_myx.c index a2ecd730bc1..b326c41c4f8 100644 --- a/sys/dev/pci/if_myx.c +++ b/sys/dev/pci/if_myx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_myx.c,v 1.61 2014/07/12 18:48:51 tedu Exp $ */ +/* $OpenBSD: if_myx.c,v 1.62 2014/08/18 05:11:03 dlg Exp $ */ /* * Copyright (c) 2007 Reyk Floeter <reyk@openbsd.org> @@ -29,6 +29,7 @@ #include <sys/kernel.h> #include <sys/socket.h> #include <sys/malloc.h> +#include <sys/pool.h> #include <sys/timeout.h> #include <sys/proc.h> #include <sys/device.h> diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 27487c01370..d0cd8afbabd 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sysctl.c,v 1.260 2014/07/22 11:06:09 mpi Exp $ */ +/* $OpenBSD: kern_sysctl.c,v 1.261 2014/08/18 05:11:03 dlg Exp $ */ /* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */ /*- @@ -43,6 +43,7 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> +#include <sys/pool.h> #include <sys/proc.h> #include <sys/resourcevar.h> #include <sys/signalvar.h> diff --git a/sys/kern/uipc_mbuf2.c b/sys/kern/uipc_mbuf2.c index 090594c2352..7900594d9b8 100644 --- a/sys/kern/uipc_mbuf2.c +++ b/sys/kern/uipc_mbuf2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_mbuf2.c,v 1.37 2013/06/11 01:01:15 dlg Exp $ */ +/* $OpenBSD: uipc_mbuf2.c,v 1.38 2014/08/18 05:11:03 dlg Exp $ */ /* $KAME: uipc_mbuf2.c,v 1.29 2001/02/14 13:42:10 itojun Exp $ */ /* $NetBSD: uipc_mbuf.c,v 1.40 1999/04/01 00:23:25 thorpej Exp $ */ @@ -66,6 +66,7 @@ #include <sys/systm.h> #include <sys/proc.h> #include <sys/malloc.h> +#include <sys/pool.h> #include <sys/mbuf.h> extern struct pool mtagpool; diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index f202be72b03..bdfdcf6617e 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mbuf.h,v 1.181 2014/08/18 04:06:16 dlg Exp $ */ +/* $OpenBSD: mbuf.h,v 1.182 2014/08/18 05:11:03 dlg Exp $ */ /* $NetBSD: mbuf.h,v 1.19 1996/02/09 18:25:14 christos Exp $ */ /* @@ -36,7 +36,6 @@ #define _SYS_MBUF_H_ #include <sys/malloc.h> -#include <sys/pool.h> #include <sys/queue.h> /* |