diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 12:40:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 12:40:26 -0400 |
commit | 9f3938346a5c1fa504647670edb5fea5756cfb00 (patch) | |
tree | 7cf6d24d6b076c8db8571494984924cac03703a2 /drivers/net/ethernet/intel/e1000e/netdev.c | |
parent | 69a7aebcf019ab3ff5764525ad6858fbe23bb86d (diff) | |
parent | 317b6e128247f75976b0fc2b9fd8d2c20ef13b3a (diff) |
Merge branch 'kmap_atomic' of git://github.com/congwang/linux
Pull kmap_atomic cleanup from Cong Wang.
It's been in -next for a long time, and it gets rid of the (no longer
used) second argument to k[un]map_atomic().
Fix up a few trivial conflicts in various drivers, and do an "evil
merge" to catch some new uses that have come in since Cong's tree.
* 'kmap_atomic' of git://github.com/congwang/linux: (59 commits)
feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal
highmem: kill all __kmap_atomic() [swarren@nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename]
drbd: remove the second argument of k[un]map_atomic()
zcache: remove the second argument of k[un]map_atomic()
gma500: remove the second argument of k[un]map_atomic()
dm: remove the second argument of k[un]map_atomic()
tomoyo: remove the second argument of k[un]map_atomic()
sunrpc: remove the second argument of k[un]map_atomic()
rds: remove the second argument of k[un]map_atomic()
net: remove the second argument of k[un]map_atomic()
mm: remove the second argument of k[un]map_atomic()
lib: remove the second argument of k[un]map_atomic()
power: remove the second argument of k[un]map_atomic()
kdb: remove the second argument of k[un]map_atomic()
udf: remove the second argument of k[un]map_atomic()
ubifs: remove the second argument of k[un]map_atomic()
squashfs: remove the second argument of k[un]map_atomic()
reiserfs: remove the second argument of k[un]map_atomic()
ocfs2: remove the second argument of k[un]map_atomic()
ntfs: remove the second argument of k[un]map_atomic()
...
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/netdev.c')
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index a9a4ea2c616e..7152eb11b7b9 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c | |||
@@ -1301,10 +1301,9 @@ static bool e1000_clean_rx_irq_ps(struct e1000_ring *rx_ring, int *work_done, | |||
1301 | ps_page->dma, | 1301 | ps_page->dma, |
1302 | PAGE_SIZE, | 1302 | PAGE_SIZE, |
1303 | DMA_FROM_DEVICE); | 1303 | DMA_FROM_DEVICE); |
1304 | vaddr = kmap_atomic(ps_page->page, | 1304 | vaddr = kmap_atomic(ps_page->page); |
1305 | KM_SKB_DATA_SOFTIRQ); | ||
1306 | memcpy(skb_tail_pointer(skb), vaddr, l1); | 1305 | memcpy(skb_tail_pointer(skb), vaddr, l1); |
1307 | kunmap_atomic(vaddr, KM_SKB_DATA_SOFTIRQ); | 1306 | kunmap_atomic(vaddr); |
1308 | dma_sync_single_for_device(&pdev->dev, | 1307 | dma_sync_single_for_device(&pdev->dev, |
1309 | ps_page->dma, | 1308 | ps_page->dma, |
1310 | PAGE_SIZE, | 1309 | PAGE_SIZE, |
@@ -1503,12 +1502,10 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_ring *rx_ring, int *work_done, | |||
1503 | if (length <= copybreak && | 1502 | if (length <= copybreak && |
1504 | skb_tailroom(skb) >= length) { | 1503 | skb_tailroom(skb) >= length) { |
1505 | u8 *vaddr; | 1504 | u8 *vaddr; |
1506 | vaddr = kmap_atomic(buffer_info->page, | 1505 | vaddr = kmap_atomic(buffer_info->page); |
1507 | KM_SKB_DATA_SOFTIRQ); | ||
1508 | memcpy(skb_tail_pointer(skb), vaddr, | 1506 | memcpy(skb_tail_pointer(skb), vaddr, |
1509 | length); | 1507 | length); |
1510 | kunmap_atomic(vaddr, | 1508 | kunmap_atomic(vaddr); |
1511 | KM_SKB_DATA_SOFTIRQ); | ||
1512 | /* re-use the page, so don't erase | 1509 | /* re-use the page, so don't erase |
1513 | * buffer_info->page */ | 1510 | * buffer_info->page */ |
1514 | skb_put(skb, length); | 1511 | skb_put(skb, length); |