From: Cong Wang <amwang@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
Cong Wang <amwang@redhat.com>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>,
Jesse Brandeburg <jesse.brandeburg@intel.com>,
Bruce Allan <bruce.w.allan@intel.com>,
Carolyn Wyborny <carolyn.wyborny@intel.com>,
Don Skidmore <donald.c.skidmore@intel.com>,
Greg Rose <gregory.v.rose@intel.com>,
Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>,
Alex Duyck <alexander.h.duyck@intel.com>,
John Ronciak <john.ronciak@intel.com>,
"David S. Miller" <davem@davemloft.net>,
Jiri Pirko <jpirko@redhat.com>, Dean Nelson <dnelson@redhat.com>,
Eric Dumazet <eric.dumazet@gmail.com>,
Ian Campbell <ian.campbell@citrix.com>,
David Decotigny <decot@google.com>,
e1000-devel@lists.sourceforge.net, netdev@vger.kernel.org
Subject: [PATCH 20/60] net: remove the second argument of k[un]map_atomic()
Date: Fri, 10 Feb 2012 13:39:41 +0800 [thread overview]
Message-ID: <1328852421-19678-21-git-send-email-amwang@redhat.com> (raw)
In-Reply-To: <1328852421-19678-1-git-send-email-amwang@redhat.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
---
drivers/net/ethernet/intel/e1000/e1000_main.c | 6 ++----
drivers/net/ethernet/intel/e1000e/netdev.c | 10 ++++------
drivers/net/ethernet/sun/cassini.c | 4 ++--
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 669ca38..e8a4759 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -3878,11 +3878,9 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,
if (length <= copybreak &&
skb_tailroom(skb) >= length) {
u8 *vaddr;
- vaddr = kmap_atomic(buffer_info->page,
- KM_SKB_DATA_SOFTIRQ);
+ vaddr = kmap_atomic(buffer_info->page);
memcpy(skb_tail_pointer(skb), vaddr, length);
- kunmap_atomic(vaddr,
- KM_SKB_DATA_SOFTIRQ);
+ kunmap_atomic(vaddr);
/* re-use the page, so don't erase
* buffer_info->page */
skb_put(skb, length);
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 3911401..7a1ea1d 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -1277,9 +1277,9 @@ static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
*/
dma_sync_single_for_cpu(&pdev->dev, ps_page->dma,
PAGE_SIZE, DMA_FROM_DEVICE);
- vaddr = kmap_atomic(ps_page->page, KM_SKB_DATA_SOFTIRQ);
+ vaddr = kmap_atomic(ps_page->page);
memcpy(skb_tail_pointer(skb), vaddr, l1);
- kunmap_atomic(vaddr, KM_SKB_DATA_SOFTIRQ);
+ kunmap_atomic(vaddr);
dma_sync_single_for_device(&pdev->dev, ps_page->dma,
PAGE_SIZE, DMA_FROM_DEVICE);
@@ -1470,12 +1470,10 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,
if (length <= copybreak &&
skb_tailroom(skb) >= length) {
u8 *vaddr;
- vaddr = kmap_atomic(buffer_info->page,
- KM_SKB_DATA_SOFTIRQ);
+ vaddr = kmap_atomic(buffer_info->page);
memcpy(skb_tail_pointer(skb), vaddr,
length);
- kunmap_atomic(vaddr,
- KM_SKB_DATA_SOFTIRQ);
+ kunmap_atomic(vaddr);
/* re-use the page, so don't erase
* buffer_info->page */
skb_put(skb, length);
diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c
index f10665f..f459c3a 100644
--- a/drivers/net/ethernet/sun/cassini.c
+++ b/drivers/net/ethernet/sun/cassini.c
@@ -104,8 +104,8 @@
#include <asm/byteorder.h>
#include <asm/uaccess.h>
-#define cas_page_map(x) kmap_atomic((x), KM_SKB_DATA_SOFTIRQ)
-#define cas_page_unmap(x) kunmap_atomic((x), KM_SKB_DATA_SOFTIRQ)
+#define cas_page_map(x) kmap_atomic((x))
+#define cas_page_unmap(x) kunmap_atomic((x))
#define CAS_NCPUS num_online_cpus()
#define cas_skb_release(x) netif_rx(x)
--
1.7.7.6
next prev parent reply other threads:[~2012-02-10 5:44 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-10 5:39 [Resend PATCH 00/60] highmem: " Cong Wang
2012-02-10 5:39 ` [PATCH 01/60] highmem: mark k[un]map_atomic() with two arguments as deprecated Cong Wang
2012-02-17 23:59 ` Andrew Morton
2012-02-19 14:57 ` Cong Wang
2012-02-10 5:39 ` [PATCH 02/60] include/linux/highmem.h: remove the second argument of k[un]map_atomic() Cong Wang
2012-02-10 5:39 ` [PATCH 03/60] arm: " Cong Wang
2012-02-10 5:39 ` [PATCH 04/60] mips: " Cong Wang
2012-02-10 5:39 ` [PATCH 05/60] powerpc: " Cong Wang
2012-02-10 5:39 ` [PATCH 06/60] sh: " Cong Wang
2012-02-10 5:39 ` [PATCH 07/60] um: " Cong Wang
2012-02-10 5:39 ` [PATCH 08/60] x86: " Cong Wang
2012-02-10 5:39 ` [PATCH 09/60] crypto: " Cong Wang
2012-02-10 5:39 ` [PATCH 10/60] ata: " Cong Wang
2012-02-10 5:39 ` [PATCH 11/60] block: " Cong Wang
2012-02-10 5:39 ` [PATCH 12/60] crypto: " Cong Wang
2012-02-10 5:39 ` [PATCH 13/60] edac: " Cong Wang
2012-02-10 5:39 ` [PATCH 14/60] drm: " Cong Wang
2012-02-10 7:05 ` Thomas Hellstrom
2012-02-10 5:39 ` [PATCH 15/60] ide: " Cong Wang
2012-02-10 5:39 ` [PATCH 16/60] infiniband: " Cong Wang
2012-02-10 5:39 ` [PATCH 17/60] md: " Cong Wang
2012-02-10 5:39 ` [PATCH 18/60] media: " Cong Wang
2012-02-10 5:39 ` [PATCH 19/60] memstick: " Cong Wang
2012-02-10 5:39 ` Cong Wang [this message]
2012-02-10 5:39 ` [PATCH 22/60] hv: " Cong Wang
2012-02-10 5:39 ` [PATCH 23/60] rtl8192u: " Cong Wang
2012-02-10 5:39 ` [PATCH 24/60] zram: " Cong Wang
2012-02-10 5:39 ` [PATCH 25/60] target: " Cong Wang
2012-02-10 22:18 ` Nicholas A. Bellinger
2012-02-13 7:44 ` Cong Wang
2012-02-10 5:39 ` [PATCH 26/60] vhost: " Cong Wang
2012-02-10 5:39 ` [PATCH 27/60] fs: " Cong Wang
2012-02-10 5:39 ` [PATCH 28/60] btrfs: " Cong Wang
2012-02-10 5:39 ` [PATCH 29/60] ecryptfs: " Cong Wang
2012-02-10 20:16 ` Tyler Hicks
2012-02-13 7:46 ` Cong Wang
2012-02-10 5:39 ` [PATCH 30/60] afs: " Cong Wang
2012-02-10 5:39 ` [PATCH 31/60] exofs: " Cong Wang
2012-02-10 5:39 ` [PATCH 32/60] ext2: " Cong Wang
2012-02-10 5:39 ` [PATCH 33/60] fuse: " Cong Wang
2012-02-10 5:39 ` [PATCH 34/60] gfs2: " Cong Wang
2012-02-10 5:39 ` [PATCH 35/60] jbd: " Cong Wang
2012-02-10 5:39 ` [PATCH 36/60] jbd2: " Cong Wang
2012-02-10 5:39 ` [PATCH 37/60] logfs: " Cong Wang
2012-02-10 5:39 ` [PATCH 38/60] minix: " Cong Wang
2012-02-10 5:40 ` [PATCH 39/60] nfs: " Cong Wang
2012-02-10 5:40 ` [PATCH 40/60] nilfs2: " Cong Wang
2012-02-10 5:40 ` [PATCH 41/60] ntfs: " Cong Wang
2012-02-10 5:40 ` [PATCH 42/60] ocfs2: " Cong Wang
2012-02-10 5:40 ` [PATCH 43/60] reiserfs: " Cong Wang
2012-02-10 5:40 ` [PATCH 44/60] squashfs: " Cong Wang
2012-02-10 5:40 ` [PATCH 45/60] ubifs: " Cong Wang
2012-02-10 5:40 ` [PATCH 46/60] udf: " Cong Wang
2012-02-10 5:40 ` [PATCH 47/60] kdb: " Cong Wang
2012-02-10 5:40 ` [PATCH 48/60] power: " Cong Wang
2012-02-10 5:40 ` [PATCH 49/60] lib: " Cong Wang
2012-02-10 5:40 ` [PATCH 50/60] mm: " Cong Wang
2012-02-10 5:40 ` [PATCH 51/60] net: " Cong Wang
2012-02-10 5:40 ` [PATCH 52/60] rds: " Cong Wang
2012-02-10 5:40 ` [PATCH 53/60] sunrpc: " Cong Wang
2012-02-10 5:40 ` [PATCH 54/60] tomoyo: " Cong Wang
2012-02-10 5:40 ` [PATCH 55/60] dm: " Cong Wang
2012-02-10 5:40 ` [PATCH 56/60] gma500: " Cong Wang
2012-02-10 5:40 ` [PATCH 57/60] zcache: " Cong Wang
2012-02-10 5:40 ` [PATCH 58/60] drbd: " Cong Wang
[not found] ` <CA+xKNSgdt7mc2NYTbprFspE54R_4T4PTzyGKyKESqBRyaNCPJg@mail.gmail.com>
2012-02-13 7:43 ` [Drbd-dev] " Cong Wang
2012-02-10 5:40 ` [PATCH 60/60] feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal Cong Wang
[not found] ` <1328852421-19678-60-git-send-email-amwang@redhat.com>
2012-02-10 13:05 ` [PATCH 59/60] highmem: kill all __kmap_atomic() [swarren@nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename] Chris Metcalf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1328852421-19678-21-git-send-email-amwang@redhat.com \
--to=amwang@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=alexander.h.duyck@intel.com \
--cc=bruce.w.allan@intel.com \
--cc=carolyn.wyborny@intel.com \
--cc=davem@davemloft.net \
--cc=decot@google.com \
--cc=dnelson@redhat.com \
--cc=donald.c.skidmore@intel.com \
--cc=e1000-devel@lists.sourceforge.net \
--cc=eric.dumazet@gmail.com \
--cc=gregory.v.rose@intel.com \
--cc=ian.campbell@citrix.com \
--cc=jeffrey.t.kirsher@intel.com \
--cc=jesse.brandeburg@intel.com \
--cc=john.ronciak@intel.com \
--cc=jpirko@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=peter.p.waskiewicz.jr@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®