From 624b7ff58add2e06a88827925034540a3afe11c5 Mon Sep 17 00:00:00 2001
From: Cong Wang <amwang@redhat.com>
Date: Fri, 25 Nov 2011 23:14:39 +0800
Subject: [PATCH] --- yaml --- r: 291827 b: refs/heads/master c:
 0352bc550cfa536e4fa2c0e906359bcd5687afff h: refs/heads/master i:   291825:
 9ddbbcf53c463de59ca033d8e36d62a3b8f47122   291823:
 dc7f5aee8ff5d7e4025c5252f298b2c2957f4d7c v: v3

---
 [refs]                    | 2 +-
 trunk/net/core/kmap_skb.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3e5206d69207..71240612df8b 100644
--- 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
index 81e1ed7c8383..52d0a4459041 100644
--- 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