---

yaml --- r: 291827 b: refs/heads/master c: 0352bc5 h: refs/heads/master i: 291825: 9ddbbcf 291823: dc7f5ae v: v3
git-mirror · Mar 20, 2012 · 624b7ff · 624b7ff
1 parent 1f3eded
commit 624b7ff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b04c5fec43c0da610a2c37f70c5b013101a6ad7
+refs/heads/master: 0352bc550cfa536e4fa2c0e906359bcd5687afff
diff --git a/trunk/net/core/kmap_skb.h b/trunk/net/core/kmap_skb.h
@@ -7,12 +7,12 @@ static inline void *kmap_skb_frag(const skb_frag_t *frag)
 
 	local_bh_disable();
 #endif
-	return kmap_atomic(skb_frag_page(frag), KM_SKB_DATA_SOFTIRQ);
+	return kmap_atomic(skb_frag_page(frag));
 }
 
 static inline void kunmap_skb_frag(void *vaddr)
 {
-	kunmap_atomic(vaddr, KM_SKB_DATA_SOFTIRQ);
+	kunmap_atomic(vaddr);
 #ifdef CONFIG_HIGHMEM
 	local_bh_enable();
 #endif