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/e1000 | |
| 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/e1000')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000/e1000_main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c index 6419a88a69e6..0e9aec8f6917 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_main.c +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c | |||
| @@ -4101,11 +4101,9 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter, | |||
| 4101 | if (length <= copybreak && | 4101 | if (length <= copybreak && |
| 4102 | skb_tailroom(skb) >= length) { | 4102 | skb_tailroom(skb) >= length) { |
| 4103 | u8 *vaddr; | 4103 | u8 *vaddr; |
| 4104 | vaddr = kmap_atomic(buffer_info->page, | 4104 | vaddr = kmap_atomic(buffer_info->page); |
| 4105 | KM_SKB_DATA_SOFTIRQ); | ||
| 4106 | memcpy(skb_tail_pointer(skb), vaddr, length); | 4105 | memcpy(skb_tail_pointer(skb), vaddr, length); |
| 4107 | kunmap_atomic(vaddr, | 4106 | kunmap_atomic(vaddr); |
| 4108 | KM_SKB_DATA_SOFTIRQ); | ||
| 4109 | /* re-use the page, so don't erase | 4107 | /* re-use the page, so don't erase |
| 4110 | * buffer_info->page */ | 4108 | * buffer_info->page */ |
| 4111 | skb_put(skb, length); | 4109 | skb_put(skb, length); |