diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-10-19 16:08:53 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2006-12-04 02:00:29 -0500 |
commit | a1f8e7f7fb9d7e2cbcb53170edca7c0ac4680697 (patch) | |
tree | 2d1190c0099291d56a9c986f16bec17df2f6768b /include/linux/skbuff.h | |
parent | b07e4ecd4d380ad697c54d729cb653d027077c99 (diff) |
[PATCH] severing skbuff.h -> highmem.h
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include/linux/skbuff.h')
-rw-r--r-- | include/linux/skbuff.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 14ec16d2d9ba..24ce0add6c54 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <asm/types.h> | 23 | #include <asm/types.h> |
24 | #include <linux/spinlock.h> | 24 | #include <linux/spinlock.h> |
25 | #include <linux/mm.h> | 25 | #include <linux/mm.h> |
26 | #include <linux/highmem.h> | ||
27 | #include <linux/poll.h> | 26 | #include <linux/poll.h> |
28 | #include <linux/net.h> | 27 | #include <linux/net.h> |
29 | #include <linux/textsearch.h> | 28 | #include <linux/textsearch.h> |
@@ -1295,24 +1294,6 @@ static inline int pskb_trim_rcsum(struct sk_buff *skb, unsigned int len) | |||
1295 | return __pskb_trim(skb, len); | 1294 | return __pskb_trim(skb, len); |
1296 | } | 1295 | } |
1297 | 1296 | ||
1298 | static inline void *kmap_skb_frag(const skb_frag_t *frag) | ||
1299 | { | ||
1300 | #ifdef CONFIG_HIGHMEM | ||
1301 | BUG_ON(in_irq()); | ||
1302 | |||
1303 | local_bh_disable(); | ||
1304 | #endif | ||
1305 | return kmap_atomic(frag->page, KM_SKB_DATA_SOFTIRQ); | ||
1306 | } | ||
1307 | |||
1308 | static inline void kunmap_skb_frag(void *vaddr) | ||
1309 | { | ||
1310 | kunmap_atomic(vaddr, KM_SKB_DATA_SOFTIRQ); | ||
1311 | #ifdef CONFIG_HIGHMEM | ||
1312 | local_bh_enable(); | ||
1313 | #endif | ||
1314 | } | ||
1315 | |||
1316 | #define skb_queue_walk(queue, skb) \ | 1297 | #define skb_queue_walk(queue, skb) \ |
1317 | for (skb = (queue)->next; \ | 1298 | for (skb = (queue)->next; \ |
1318 | prefetch(skb->next), (skb != (struct sk_buff *)(queue)); \ | 1299 | prefetch(skb->next), (skb != (struct sk_buff *)(queue)); \ |