[PATCH] severing skbuff.h -> mm.h

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/drivers/isdn/divert/isdn_divert.c b/drivers/isdn/divert/isdn_divert.c
index 1f5ebe9ee72cd38b0844966caf0be17c8fa18e3e..03319ea5aa0cdf8e6445f29909746bbfe7d53454 100644 (file)
--- a/drivers/isdn/divert/isdn_divert.c
+++ b/drivers/isdn/divert/isdn_divert.c
@@ -10,6 +10,8 @@
  */
 
 #include <linux/proc_fs.h>
+#include <linux/timer.h>
+#include <linux/jiffies.h>
 
 #include "isdn_divert.h"
 

diff --git a/drivers/net/ehea/ehea_qmr.c b/drivers/net/ehea/ehea_qmr.c
index 72ef7bde33463725e10759c960b8f15483a359a1..f143e13b229dda570b10f84142398aad43ee8699 100644 (file)
--- a/drivers/net/ehea/ehea_qmr.c
+++ b/drivers/net/ehea/ehea_qmr.c
@@ -26,6 +26,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <linux/mm.h>
 #include "ehea.h"
 #include "ehea_phyp.h"
 #include "ehea_qmr.h"

diff --git a/drivers/net/lance.c b/drivers/net/lance.c
index 6efbd499d7526ebdf5fb3fb8a401a07630f71337..4256c13c73c290d8a70e7e12114b2882a4ed467f 100644 (file)
--- a/drivers/net/lance.c
+++ b/drivers/net/lance.c
@@ -57,6 +57,7 @@ static const char version[] = "lance.c:v1.16 2006/11/09 dplatt@3do.com, becker@c
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/mm.h>
 #include <linux/bitops.h>
 
 #include <asm/io.h>

diff --git a/drivers/net/ne3210.c b/drivers/net/ne3210.c
index d663289754255015d90fc7e4cd3b3342e31084bc..1a6fed76d4cc6f429d04570115f27360f5ffe234 100644 (file)
--- a/drivers/net/ne3210.c
+++ b/drivers/net/ne3210.c
@@ -36,6 +36,7 @@
 #include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
+#include <linux/mm.h>
 
 #include <asm/io.h>
 #include <asm/system.h>

diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
index 12cbfd190dd7893c1ade0a4b9feadd9a6bf76414..92d11b961db88bd81133ce89eb7fec03365f1f40 100644 (file)
--- a/drivers/net/sk98lin/skge.c
+++ b/drivers/net/sk98lin/skge.c
@@ -114,6 +114,7 @@
 #include       <linux/dma-mapping.h>
 #include       <linux/ip.h>
 #include       <linux/mii.h>
+#include       <linux/mm.h>
 
 #include       "h/skdrv1st.h"
 #include       "h/skdrv2nd.h"

diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index 7a0aee6c869d2331162a3b4a17574199ef6f8bd4..bf873ea2579733f572f25886b9a0ab9d358cbf3d 100644 (file)
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -41,6 +41,7 @@
 #include <linux/ethtool.h>
 #include <linux/mii.h>
 #include <linux/if_vlan.h>
+#include <linux/mm.h>
 #include <asm/processor.h>             /* Processor type for cache alignment. */
 #include <asm/uaccess.h>
 #include <asm/io.h>

diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 334c6cfd659573b627ac25e875cc5c12ed0d5538..cf44e72399b9cf858508b179237a0e903c3f996f 100644 (file)
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -56,6 +56,7 @@
 #include <linux/if_vlan.h>
 #include <linux/bitops.h>
 #include <linux/mutex.h>
+#include <linux/mm.h>
 
 #include <asm/system.h>
 #include <asm/io.h>

diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index ec432ea879fbaa8d178a5a0e7253309264e3b1ec..4d59ece67292f09317275117f19ff7c013a277df 100644 (file)
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -32,6 +32,7 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/mm.h>
 #include <linux/bitops.h>
 
 #include <asm/system.h>

diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index 8ddea1da7c051c8c158a328b2acf58586138aa61..9781b16bb8b66ffe727dee15537f7a855bb16d42 100644 (file)
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -117,6 +117,7 @@ static const int multicast_filter_limit = 32;
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/ethtool.h>

diff --git a/include/linux/igmp.h b/include/linux/igmp.h
index 6e7ea2f0a57c557b80c7b77de0f8bad13dafba36..9dbb525c5178d59bef3725ddba461b77342a2c9e 100644 (file)
--- a/include/linux/igmp.h
+++ b/include/linux/igmp.h
@@ -127,6 +127,7 @@ struct igmpv3_query {
 
 #ifdef __KERNEL__
 #include <linux/skbuff.h>
+#include <linux/timer.h>
 #include <linux/in.h>
 
 extern int sysctl_igmp_max_memberships;

diff --git a/include/linux/kernelcapi.h b/include/linux/kernelcapi.h
index 891bb2cf0aa8202993d0e4c7bf54bb394d35d812..f8a0ff86dacc448881525fa38dcadfb3783e5cfc 100644 (file)
--- a/include/linux/kernelcapi.h
+++ b/include/linux/kernelcapi.h
@@ -47,6 +47,7 @@ typedef struct kcapi_carddef {
 
 #include <linux/list.h>
 #include <linux/skbuff.h>
+#include <linux/workqueue.h>
 
 #define        KCI_CONTRUP     0       /* arg: struct capi_profile */
 #define        KCI_CONTRDOWN   1       /* arg: NULL */

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 949eada46ce17d1d41f5845dc4e63be90c804ab2..c57088f575a37d9961bab86e25bcbcc8658f424f 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -30,6 +30,7 @@
 #include <linux/if_packet.h>
 
 #ifdef __KERNEL__
+#include <linux/timer.h>
 #include <asm/atomic.h>
 #include <asm/cache.h>
 #include <asm/byteorder.h>

diff --git a/include/linux/netfilter_ipv4/ip_conntrack.h b/include/linux/netfilter_ipv4/ip_conntrack.h
index 61da56941dce9572bc26677ceccf1a03fb49ad65..33581c13d9474a6d33dfc080b4a75df990ab9ee0 100644 (file)
--- a/include/linux/netfilter_ipv4/ip_conntrack.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack.h
@@ -9,6 +9,7 @@
 #include <linux/compiler.h>
 #include <asm/atomic.h>
 
+#include <linux/timer.h>
 #include <linux/netfilter_ipv4/ip_conntrack_tcp.h>
 #include <linux/netfilter_ipv4/ip_conntrack_icmp.h>
 #include <linux/netfilter_ipv4/ip_conntrack_proto_gre.h>

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 5c5a08576dcc73f8cb86b4441e0bc0152e5402c5..6bdff9b148d0e3a33cde2a912f52ccb67e3f1bad 100644 (file)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -22,7 +22,6 @@
 #include <asm/atomic.h>
 #include <asm/types.h>
 #include <linux/spinlock.h>
-#include <linux/mm.h>
 #include <linux/net.h>
 #include <linux/textsearch.h>
 #include <net/checksum.h>

diff --git a/include/net/irda/timer.h b/include/net/irda/timer.h
index 2c5d8864ab775871f5520c94d9277572118ef007..cb61568547d1328e8d59daf26920bea600a20013 100644 (file)
--- a/include/net/irda/timer.h
+++ b/include/net/irda/timer.h
@@ -28,6 +28,7 @@
 #define TIMER_H
 
 #include <linux/timer.h>
+#include <linux/jiffies.h>
 
 #include <asm/param.h>  /* for HZ */
 

diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index 032b36a0e3781de36d3f9f8d2ca958b4d23b189d..bd01b4633ee20138dc6681b2e15dd2e7cabc471c 100644 (file)
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -56,6 +56,7 @@ union nf_conntrack_help {
 
 #include <linux/types.h>
 #include <linux/skbuff.h>
+#include <linux/timer.h>
 
 #ifdef CONFIG_NETFILTER_DEBUG
 #define NF_CT_ASSERT(x)                                                        \

diff --git a/include/net/netlink.h b/include/net/netlink.h
index fd75fd65d59ed09b9a148dd018da7aba6b3bfb59..bcaf67b7a19d131022d0f41f61d5c2e838a8a56b 100644 (file)
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -3,6 +3,7 @@
 
 #include <linux/types.h>
 #include <linux/netlink.h>
+#include <linux/jiffies.h>
 
 /* ========================================================================
  *         Netlink Messages and Attributes Interface (As Seen On TV)

diff --git a/include/net/sock.h b/include/net/sock.h
index 26fc0b16bc0cf5ab394d17ba1bc059407f6150e4..fe3a33fad03fcd1a553babe753a427e057269123 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -47,6 +47,7 @@
 #include <linux/lockdep.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>      /* struct sk_buff */
+#include <linux/mm.h>
 #include <linux/security.h>
 
 #include <linux/filter.h>

diff --git a/net/ieee80211/ieee80211_crypt_tkip.c b/net/ieee80211/ieee80211_crypt_tkip.c
index 4200ec509866581c60c6faeb07fa973f97528048..fc1f99a597327b7f80acd98d90e9650d78dc129c 100644 (file)
--- a/net/ieee80211/ieee80211_crypt_tkip.c
+++ b/net/ieee80211/ieee80211_crypt_tkip.c
@@ -16,6 +16,7 @@
 #include <linux/random.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
+#include <linux/mm.h>
 #include <linux/if_ether.h>
 #include <linux/if_arp.h>
 #include <asm/string.h>

diff --git a/net/ieee80211/ieee80211_crypt_wep.c b/net/ieee80211/ieee80211_crypt_wep.c
index 1b2efff11d39ff63fab9935e070b62d01897c193..7a95c3d8131425bb8c42bbabcb629747f06672f0 100644 (file)
--- a/net/ieee80211/ieee80211_crypt_wep.c
+++ b/net/ieee80211/ieee80211_crypt_wep.c
@@ -15,6 +15,7 @@
 #include <linux/slab.h>
 #include <linux/random.h>
 #include <linux/skbuff.h>
+#include <linux/mm.h>
 #include <asm/string.h>
 
 #include <net/ieee80211.h>

diff --git a/net/ipv4/ipvs/ip_vs_lblc.c b/net/ipv4/ipvs/ip_vs_lblc.c
index 524751e031de5203c12735d0aaa3c588dce675cd..a4385a2180ee6d3f890411927d3056fafbc48c34 100644 (file)
--- a/net/ipv4/ipvs/ip_vs_lblc.c
+++ b/net/ipv4/ipvs/ip_vs_lblc.c
@@ -45,6 +45,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/skbuff.h>
+#include <linux/jiffies.h>
 
 /* for sysctl */
 #include <linux/fs.h>

diff --git a/net/ipv4/ipvs/ip_vs_lblcr.c b/net/ipv4/ipvs/ip_vs_lblcr.c
index 08990192b6eccbd5ec9e0abc06ac161b1491432c..fe1af5d079afdee89edb20a6cfe78847acfa17cd 100644 (file)
--- a/net/ipv4/ipvs/ip_vs_lblcr.c
+++ b/net/ipv4/ipvs/ip_vs_lblcr.c
@@ -43,6 +43,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/skbuff.h>
+#include <linux/jiffies.h>
 
 /* for sysctl */
 #include <linux/fs.h>

diff --git a/net/irda/discovery.c b/net/irda/discovery.c
index 3fefc822c1c087c2cebd4baadb646ef771442784..89fd2a2cbca66a170c471672cfcbcd8c56745fd6 100644 (file)
--- a/net/irda/discovery.c
+++ b/net/irda/discovery.c
@@ -32,6 +32,7 @@
 
 #include <linux/string.h>
 #include <linux/socket.h>
+#include <linux/fs.h>
 #include <linux/seq_file.h>
 
 #include <net/irda/irda.h>

diff --git a/net/irda/iriap.c b/net/irda/iriap.c
index 8cfd076c4c12ae3db3947d201a514e9b1cee2179..8f1c6d65b24786f174bf1dbde831c97a7e7a2e99 100644 (file)
--- a/net/irda/iriap.c
+++ b/net/irda/iriap.c
@@ -27,6 +27,7 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/skbuff.h>
+#include <linux/fs.h>
 #include <linux/string.h>
 #include <linux/init.h>
 #include <linux/seq_file.h>

diff --git a/net/irda/irttp.c b/net/irda/irttp.c
index 9c446a72ff1faa8125f7429501f484d284338445..252f11012566ca1758851ef9489785ca8fe95ce7 100644 (file)
--- a/net/irda/irttp.c
+++ b/net/irda/irttp.c
@@ -26,6 +26,7 @@
 
 #include <linux/skbuff.h>
 #include <linux/init.h>
+#include <linux/fs.h>
 #include <linux/seq_file.h>
 
 #include <asm/byteorder.h>

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 93d97d9f9da8a9132e35e504b964cabffb83cec5..eaa0f8a1adb61422629284ea0d156fe32597b364 100644 (file)
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -46,6 +46,7 @@
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
 #include <linux/socket.h>
+#include <linux/mm.h>
 
 #include <net/netfilter/nf_conntrack.h>
 #include <net/netfilter/nf_conntrack_l3proto.h>

diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index 58522fc65d333ca163fe25e4925cfe4496ecdbc6..8996584b84998708ccc0eabf94b4faa19b96ad11 100644 (file)
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -21,6 +21,7 @@
 #include <linux/string.h>
 #include <linux/vmalloc.h>
 #include <linux/mutex.h>
+#include <linux/mm.h>
 
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter_arp.h>

diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index 501c564e247ff301aa4b1e15b8a2851ce9203d78..a98de0b54d6514accd49dd7b23c13a027fb17aa4 100644 (file)
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -17,6 +17,7 @@
 #include <linux/seq_file.h>
 #include <linux/list.h>
 #include <linux/skbuff.h>
+#include <linux/mm.h>
 #include <linux/in.h>
 #include <linux/ip.h>
 #include <linux/ipv6.h>