From patchwork Fri Feb 10 05:40:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amerigo Wang X-Patchwork-Id: 140493 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A0223B6F13 for ; Fri, 10 Feb 2012 16:49:47 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932688Ab2BJFrV (ORCPT ); Fri, 10 Feb 2012 00:47:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:5505 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932577Ab2BJFrS (ORCPT ); Fri, 10 Feb 2012 00:47:18 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q1A5lGSs032583 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 10 Feb 2012 00:47:16 -0500 Received: from cr0.redhat.com (vpn-244-44.nrt.redhat.com [10.64.244.44]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q1A5eVlJ021917; Fri, 10 Feb 2012 00:47:13 -0500 From: Cong Wang To: linux-kernel@vger.kernel.org Cc: Andrew Morton , Cong Wang , "David S. Miller" , Ian Campbell , netdev@vger.kernel.org Subject: [PATCH 51/60] net: remove the second argument of k[un]map_atomic() Date: Fri, 10 Feb 2012 13:40:12 +0800 Message-Id: <1328852421-19678-52-git-send-email-amwang@redhat.com> In-Reply-To: <1328852421-19678-1-git-send-email-amwang@redhat.com> References: <1328852421-19678-1-git-send-email-amwang@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Acked-by: David S. Miller Signed-off-by: Cong Wang --- net/core/kmap_skb.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/core/kmap_skb.h b/net/core/kmap_skb.h index 81e1ed7..52d0a44 100644 --- a/net/core/kmap_skb.h +++ b/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