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, 6 deletions

diff --git a/fs/afs/fsclient.c b/fs/afs/fsclient.c
index 2f213d109c21..b960ff05ea0b 100644
--- a/fs/afs/fsclient.c
+++ b/fs/afs/fsclient.c
@@ -365,10 +365,10 @@ static int afs_deliver_fs_fetch_data(struct afs_call *call,
                 _debug("extract data");
                 if (call->count > 0) {
                         page = call->reply3;
-                        buffer = kmap_atomic(page, KM_USER0);
+                        buffer = kmap_atomic(page);
                         ret = afs_extract_data(call, skb, last, buffer,
                                                call->count);
-                        kunmap_atomic(buffer, KM_USER0);
+                        kunmap_atomic(buffer);
                         switch (ret) {
                         case 0:         break;
                         case -EAGAIN:   return 0;
@@ -411,9 +411,9 @@ static int afs_deliver_fs_fetch_data(struct afs_call *call,
         if (call->count < PAGE_SIZE) {
                 _debug("clear");
                 page = call->reply3;
-                buffer = kmap_atomic(page, KM_USER0);
+                buffer = kmap_atomic(page);
                 memset(buffer + call->count, 0, PAGE_SIZE - call->count);
-                kunmap_atomic(buffer, KM_USER0);
+                kunmap_atomic(buffer);
         }
 
         _leave(" = 0 [done]");
diff --git a/fs/afs/mntpt.c b/fs/afs/mntpt.c
index 8f4ce2658b7d..298cf8919ec7 100644
--- a/fs/afs/mntpt.c
+++ b/fs/afs/mntpt.c
@@ -200,9 +200,9 @@ static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt)
                 if (PageError(page))
                         goto error;
 
-                buf = kmap_atomic(page, KM_USER0);
+                buf = kmap_atomic(page);
                 memcpy(devname, buf, size);
-                kunmap_atomic(buf, KM_USER0);
+                kunmap_atomic(buf);
                 page_cache_release(page);
                 page = NULL;
         }