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

diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 9691dd0966d..d8af325a6bd 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -720,13 +720,13 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)
 
                 /* FIXME: use a bounce buffer */
                 local_irq_save(flags);
-                buf = kmap_atomic(page, KM_IRQ0);
+                buf = kmap_atomic(page);
 
                 /* do the actual data transfer */
                 ap->ops->sff_data_xfer(qc->dev, buf + offset, qc->sect_size,
                                        do_write);
 
-                kunmap_atomic(buf, KM_IRQ0);
+                kunmap_atomic(buf);
                 local_irq_restore(flags);
         } else {
                 buf = page_address(page);
@@ -865,13 +865,13 @@ next_sg:
 
                 /* FIXME: use bounce buffer */
                 local_irq_save(flags);
-                buf = kmap_atomic(page, KM_IRQ0);
+                buf = kmap_atomic(page);
 
                 /* do the actual data transfer */
                 consumed = ap->ops->sff_data_xfer(dev,  buf + offset,
                                                                 count, rw);
 
-                kunmap_atomic(buf, KM_IRQ0);
+                kunmap_atomic(buf);
                 local_irq_restore(flags);
         } else {
                 buf = page_address(page);