[PATCH] severing skbuff.h -> highmem.h
authorAl Viro <viro@zeniv.linux.org.uk>
Thu, 19 Oct 2006 20:08:53 +0000 (16:08 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Mon, 4 Dec 2006 07:00:29 +0000 (02:00 -0500)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
drivers/infiniband/ulp/iser/iser_memory.c
drivers/net/sun3lance.c
fs/compat.c
include/linux/skbuff.h
kernel/auditsc.c
net/appletalk/ddp.c
net/core/kmap_skb.h [new file with mode: 0644]
net/core/skbuff.c
net/core/sock.c
net/ipv4/ip_output.c
net/packet/af_packet.c

index 0606744c3f84407b63986f7e15c097cca77a992b..5e122501fd80bdf35c1ba6608c2fe15b74c1202e 100644 (file)
@@ -35,6 +35,7 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
+#include <linux/highmem.h>
 #include <asm/io.h>
 #include <asm/scatterlist.h>
 #include <linux/scatterlist.h>
index b865db363ba0bf62fde272a2063fe7135dee788c..47a1c09d19acc98b43faba5d799170ef6d646a9a 100644 (file)
@@ -38,6 +38,7 @@ static char *version = "sun3lance.c: v1.2 1/12/2001  Sam Creasey (sammy@sammy.ne
 #include <linux/skbuff.h>
 #include <linux/bitops.h>
 
+#include <asm/cacheflush.h>
 #include <asm/setup.h>
 #include <asm/irq.h>
 #include <asm/io.h>
index 8d0a0018a7d2cfc934934a992e98bcfabf45755c..fde52d40c0b6e0a9206701a7a85e0f17d3e08fee 100644 (file)
@@ -45,6 +45,7 @@
 #include <linux/personality.h>
 #include <linux/rwsem.h>
 #include <linux/tsacct_kern.h>
+#include <linux/highmem.h>
 #include <linux/mm.h>
 
 #include <net/sock.h>          /* siocdevprivate_ioctl */
index 14ec16d2d9ba7bd6254093df7db05a242bb4f7a0..24ce0add6c54d5171986feb59b0bc8f81f2b3872 100644 (file)
@@ -23,7 +23,6 @@
 #include <asm/types.h>
 #include <linux/spinlock.h>
 #include <linux/mm.h>
-#include <linux/highmem.h>
 #include <linux/poll.h>
 #include <linux/net.h>
 #include <linux/textsearch.h>
@@ -1295,24 +1294,6 @@ static inline int pskb_trim_rcsum(struct sk_buff *skb, unsigned int len)
        return __pskb_trim(skb, len);
 }
 
-static inline void *kmap_skb_frag(const skb_frag_t *frag)
-{
-#ifdef CONFIG_HIGHMEM
-       BUG_ON(in_irq());
-
-       local_bh_disable();
-#endif
-       return kmap_atomic(frag->page, KM_SKB_DATA_SOFTIRQ);
-}
-
-static inline void kunmap_skb_frag(void *vaddr)
-{
-       kunmap_atomic(vaddr, KM_SKB_DATA_SOFTIRQ);
-#ifdef CONFIG_HIGHMEM
-       local_bh_enable();
-#endif
-}
-
 #define skb_queue_walk(queue, skb) \
                for (skb = (queue)->next;                                       \
                     prefetch(skb->next), (skb != (struct sk_buff *)(queue));   \
index 42f2f11797111de0af926f82fead3a5e86ce2ee5..ab97e51012325b24191ec5a6f2c1e2514968dd02 100644 (file)
@@ -64,6 +64,7 @@
 #include <linux/tty.h>
 #include <linux/selinux.h>
 #include <linux/binfmts.h>
+#include <linux/highmem.h>
 #include <linux/syscalls.h>
 
 #include "audit.h"
index 485e35c3b28bac873b468eda0239b03958df71e3..3a7052207708eb8f834480f7f3d56a5684cf5e28 100644 (file)
@@ -61,6 +61,7 @@
 #include <net/tcp_states.h>
 #include <net/route.h>
 #include <linux/atalk.h>
+#include "../core/kmap_skb.h"
 
 struct datalink_proto *ddp_dl, *aarp_dl;
 static const struct proto_ops atalk_dgram_ops;
diff --git a/net/core/kmap_skb.h b/net/core/kmap_skb.h
new file mode 100644 (file)
index 0000000..283c2b9
--- /dev/null
@@ -0,0 +1,19 @@
+#include <linux/highmem.h>
+
+static inline void *kmap_skb_frag(const skb_frag_t *frag)
+{
+#ifdef CONFIG_HIGHMEM
+       BUG_ON(in_irq());
+
+       local_bh_disable();
+#endif
+       return kmap_atomic(frag->page, KM_SKB_DATA_SOFTIRQ);
+}
+
+static inline void kunmap_skb_frag(void *vaddr)
+{
+       kunmap_atomic(vaddr, KM_SKB_DATA_SOFTIRQ);
+#ifdef CONFIG_HIGHMEM
+       local_bh_enable();
+#endif
+}
index a90bc439488e1f0ec07e81d4953f409a9a09d064..8e1c385e5ba914e2f50bee987ed0c96ff516ba9c 100644 (file)
@@ -56,7 +56,6 @@
 #include <linux/cache.h>
 #include <linux/rtnetlink.h>
 #include <linux/init.h>
-#include <linux/highmem.h>
 
 #include <net/protocol.h>
 #include <net/dst.h>
@@ -67,6 +66,8 @@
 #include <asm/uaccess.h>
 #include <asm/system.h>
 
+#include "kmap_skb.h"
+
 static kmem_cache_t *skbuff_head_cache __read_mostly;
 static kmem_cache_t *skbuff_fclone_cache __read_mostly;
 
index ab8fafadb4ba1f9afe8a1b8a96741e27fc74472c..419c7d3289c7a9689bca3e0164ed7ac01098c2d8 100644 (file)
 #include <linux/poll.h>
 #include <linux/tcp.h>
 #include <linux/init.h>
+#include <linux/highmem.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
index 1da3d32f8289452fd22ee2e4586e8002068ab497..a35209d517ad6d01186805dea7964113312c0666 100644 (file)
@@ -53,6 +53,7 @@
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/errno.h>
+#include <linux/highmem.h>
 
 #include <linux/socket.h>
 #include <linux/sockios.h>
index 271d2eed0699b93c01440d7d193725c5d8b010ca..08e68b67bbf642cedac2b537b79028c7f157bfaa 100644 (file)
@@ -71,6 +71,7 @@
 #include <asm/uaccess.h>
 #include <asm/ioctls.h>
 #include <asm/page.h>
+#include <asm/cacheflush.h>
 #include <asm/io.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>