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