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()
  ...

3 files changed, 8 insertions, 13 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,
                                 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 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,
                                                         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,
@@ -1503,12 +1502,10 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_ring *rx_ring, int *work_done,
                                 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 b36edbd625dd..3c2295560732 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)