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, 4 insertions, 5 deletions

diff --git a/lib/scatterlist.c b/lib/scatterlist.c
index 4ceb05d772ae..33b2cbb97380 100644
--- a/lib/scatterlist.c
+++ b/lib/scatterlist.c
@@ -390,7 +390,7 @@ bool sg_miter_next(struct sg_mapping_iter *miter)
         miter->consumed = miter->length;
 
         if (miter->__flags & SG_MITER_ATOMIC)
-                miter->addr = kmap_atomic(miter->page, KM_BIO_SRC_IRQ) + off;
+                miter->addr = kmap_atomic(miter->page) + off;
         else
                 miter->addr = kmap(miter->page) + off;
 
@@ -424,7 +424,7 @@ void sg_miter_stop(struct sg_mapping_iter *miter)
 
                 if (miter->__flags & SG_MITER_ATOMIC) {
                         WARN_ON(!irqs_disabled());
-                        kunmap_atomic(miter->addr, KM_BIO_SRC_IRQ);
+                        kunmap_atomic(miter->addr);
                 } else
                         kunmap(miter->page);
 
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 058935ef3975..d0f6315f4a24 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -349,13 +349,12 @@ void swiotlb_bounce(phys_addr_t phys, char *dma_addr, size_t size,
                         sz = min_t(size_t, PAGE_SIZE - offset, size);
 
                         local_irq_save(flags);
-                        buffer = kmap_atomic(pfn_to_page(pfn),
-                                             KM_BOUNCE_READ);
+                        buffer = kmap_atomic(pfn_to_page(pfn));
                         if (dir == DMA_TO_DEVICE)
                                 memcpy(dma_addr, buffer + offset, sz);
                         else
                                 memcpy(buffer + offset, dma_addr, sz);
-                        kunmap_atomic(buffer, KM_BOUNCE_READ);
+                        kunmap_atomic(buffer);
                         local_irq_restore(flags);
 
                         size -= sz;