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

2 files changed, 6 insertions, 8 deletions

diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index cd5cd95812b..929cc9364c8 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -2344,7 +2344,7 @@ static void transport_xor_callback(struct se_cmd *cmd)
 
         offset = 0;
         for_each_sg(cmd->t_bidi_data_sg, sg, cmd->t_bidi_data_nents, count) {
-                addr = kmap_atomic(sg_page(sg), KM_USER0);
+                addr = kmap_atomic(sg_page(sg));
                 if (!addr)
                         goto out;
 
@@ -2352,7 +2352,7 @@ static void transport_xor_callback(struct se_cmd *cmd)
                         *(addr + sg->offset + i) ^= *(buf + offset + i);
 
                 offset += sg->length;
-                kunmap_atomic(addr, KM_USER0);
+                kunmap_atomic(addr);
         }
 
 out:
diff --git a/drivers/target/tcm_fc/tfc_io.c b/drivers/target/tcm_fc/tfc_io.c
index d8cabc21036..2b693eefac5 100644
--- a/drivers/target/tcm_fc/tfc_io.c
+++ b/drivers/target/tcm_fc/tfc_io.c
@@ -146,14 +146,13 @@ int ft_queue_data_in(struct se_cmd *se_cmd)
                                         PAGE_SIZE << compound_order(page);
                 } else {
                         BUG_ON(!page);
-                        from = kmap_atomic(page + (mem_off >> PAGE_SHIFT),
-                                           KM_SOFTIRQ0);
+                        from = kmap_atomic(page + (mem_off >> PAGE_SHIFT));
                         page_addr = from;
                         from += mem_off & ~PAGE_MASK;
                         tlen = min(tlen, (size_t)(PAGE_SIZE -
                                                 (mem_off & ~PAGE_MASK)));
                         memcpy(to, from, tlen);
-                        kunmap_atomic(page_addr, KM_SOFTIRQ0);
+                        kunmap_atomic(page_addr);
                         to += tlen;
                 }
 
@@ -291,14 +290,13 @@ void ft_recv_write_data(struct ft_cmd *cmd, struct fc_frame *fp)
 
                 tlen = min(mem_len, frame_len);
 
-                to = kmap_atomic(page + (mem_off >> PAGE_SHIFT),
-                                 KM_SOFTIRQ0);
+                to = kmap_atomic(page + (mem_off >> PAGE_SHIFT));
                 page_addr = to;
                 to += mem_off & ~PAGE_MASK;
                 tlen = min(tlen, (size_t)(PAGE_SIZE -
                                           (mem_off & ~PAGE_MASK)));
                 memcpy(to, from, tlen);
-                kunmap_atomic(page_addr, KM_SOFTIRQ0);
+                kunmap_atomic(page_addr);
 
                 from += tlen;
                 frame_len -= tlen;