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

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
index fe765f49de58..76368f984023 100644
--- a/drivers/crypto/hifn_795x.c
+++ b/drivers/crypto/hifn_795x.c
@@ -1731,9 +1731,9 @@ static int ablkcipher_get(void *saddr, unsigned int *srestp, unsigned int offset
         while (size) {
                 copy = min3(srest, dst->length, size);
 
-                daddr = kmap_atomic(sg_page(dst), KM_IRQ0);
+                daddr = kmap_atomic(sg_page(dst));
                 memcpy(daddr + dst->offset + offset, saddr, copy);
-                kunmap_atomic(daddr, KM_IRQ0);
+                kunmap_atomic(daddr);
 
                 nbytes -= copy;
                 size -= copy;
@@ -1793,17 +1793,17 @@ static void hifn_process_ready(struct ablkcipher_request *req, int error)
                                 continue;
                         }
 
-                        saddr = kmap_atomic(sg_page(t), KM_SOFTIRQ0);
+                        saddr = kmap_atomic(sg_page(t));
 
                         err = ablkcipher_get(saddr, &t->length, t->offset,
                                         dst, nbytes, &nbytes);
                         if (err < 0) {
-                                kunmap_atomic(saddr, KM_SOFTIRQ0);
+                                kunmap_atomic(saddr);
                                 break;
                         }
 
                         idx += err;
-                        kunmap_atomic(saddr, KM_SOFTIRQ0);
+                        kunmap_atomic(saddr);
                 }
 
                 hifn_cipher_walk_exit(&rctx->walk);