summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2014-06-03 13:32:25 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2014-06-03 13:32:25 +0000
commitfddd2e3bcc60ee524e2e5937d07f49395fe6be22 (patch)
tree1f47c8203103ca4eff4784529649dbbeab99ac6e
parent67903c016f899375039ee0227ba265530dd88334 (diff)
Do not include <sys/malloc.h> where it is not needed.
-rw-r--r--sys/netinet6/dest6.c3
-rw-r--r--sys/netinet6/in6_ifattach.c3
-rw-r--r--sys/netinet6/in6_pcb.c3
-rw-r--r--sys/netinet6/in6_src.c3
-rw-r--r--sys/netinet6/ip6_forward.c3
-rw-r--r--sys/netinet6/ip6_input.c3
-rw-r--r--sys/netinet6/ip6_mroute.c1
-rw-r--r--sys/netinet6/udp6_output.c3
8 files changed, 8 insertions, 14 deletions
diff --git a/sys/netinet6/dest6.c b/sys/netinet6/dest6.c
index 332b8bb3bbb..50f64f72099 100644
--- a/sys/netinet6/dest6.c
+++ b/sys/netinet6/dest6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dest6.c,v 1.12 2013/10/17 16:27:45 bluhm Exp $ */
+/* $OpenBSD: dest6.c,v 1.13 2014/06/03 13:32:24 mpi Exp $ */
/* $KAME: dest6.c,v 1.25 2001/02/22 01:39:16 itojun Exp $ */
/*
@@ -32,7 +32,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/domain.h>
#include <sys/protosw.h>
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c
index 0999976a943..fe3e0a3f467 100644
--- a/sys/netinet6/in6_ifattach.c
+++ b/sys/netinet6/in6_ifattach.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in6_ifattach.c,v 1.69 2014/05/20 10:29:01 mpi Exp $ */
+/* $OpenBSD: in6_ifattach.c,v 1.70 2014/06/03 13:32:24 mpi Exp $ */
/* $KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $ */
/*
@@ -32,7 +32,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/socket.h>
#include <sys/sockio.h>
#include <sys/kernel.h>
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
index c3fd4790b76..771a12673dd 100644
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in6_pcb.c,v 1.62 2014/04/18 10:48:30 jca Exp $ */
+/* $OpenBSD: in6_pcb.c,v 1.63 2014/06/03 13:32:24 mpi Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -101,7 +101,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/domain.h>
#include <sys/protosw.h>
diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c
index 7ae1f427cf9..fefcfd1401c 100644
--- a/sys/netinet6/in6_src.c
+++ b/sys/netinet6/in6_src.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in6_src.c,v 1.43 2014/04/21 11:10:54 henning Exp $ */
+/* $OpenBSD: in6_src.c,v 1.44 2014/06/03 13:32:24 mpi Exp $ */
/* $KAME: in6_src.c,v 1.36 2001/02/06 04:08:17 itojun Exp $ */
/*
@@ -63,7 +63,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
#include <sys/socket.h>
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index 3d5b9fd26fb..cc66b458123 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_forward.c,v 1.66 2014/05/06 09:49:58 gerhard Exp $ */
+/* $OpenBSD: ip6_forward.c,v 1.67 2014/06/03 13:32:24 mpi Exp $ */
/* $KAME: ip6_forward.c,v 1.75 2001/06/29 12:42:13 jinmei Exp $ */
/*
@@ -34,7 +34,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/domain.h>
#include <sys/protosw.h>
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index 6dd9b9017bf..c2a6168798f 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_input.c,v 1.125 2014/05/13 09:30:27 mpi Exp $ */
+/* $OpenBSD: ip6_input.c,v 1.126 2014/06/03 13:32:24 mpi Exp $ */
/* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */
/*
@@ -66,7 +66,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/domain.h>
#include <sys/protosw.h>
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index 562c058fec5..e2b66ff2af9 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -81,6 +81,7 @@
*/
#include <sys/param.h>
+#include <sys/malloc.h>
#include <sys/systm.h>
#include <sys/timeout.h>
#include <sys/mbuf.h>
diff --git a/sys/netinet6/udp6_output.c b/sys/netinet6/udp6_output.c
index 11fb7318734..9f4bc4b7ac6 100644
--- a/sys/netinet6/udp6_output.c
+++ b/sys/netinet6/udp6_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udp6_output.c,v 1.29 2014/04/18 18:56:25 jca Exp $ */
+/* $OpenBSD: udp6_output.c,v 1.30 2014/06/03 13:32:24 mpi Exp $ */
/* $KAME: udp6_output.c,v 1.21 2001/02/07 11:51:54 itojun Exp $ */
/*
@@ -60,7 +60,6 @@
*/
#include <sys/param.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
#include <sys/socket.h>