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

diff --git a/arch/sh/mm/cache-sh4.c b/arch/sh/mm/cache-sh4.c
index 92eb98633ab0..112fea12522a 100644
--- a/arch/sh/mm/cache-sh4.c
+++ b/arch/sh/mm/cache-sh4.c
@@ -244,7 +244,7 @@ static void sh4_flush_cache_page(void *args)
                 if (map_coherent)
                         vaddr = kmap_coherent(page, address);
                 else
-                        vaddr = kmap_atomic(page, KM_USER0);
+                        vaddr = kmap_atomic(page);
 
                 address = (unsigned long)vaddr;
         }
@@ -259,7 +259,7 @@ static void sh4_flush_cache_page(void *args)
                 if (map_coherent)
                         kunmap_coherent(vaddr);
                 else
-                        kunmap_atomic(vaddr, KM_USER0);
+                        kunmap_atomic(vaddr);
         }
 }
 
diff --git a/arch/sh/mm/cache.c b/arch/sh/mm/cache.c
index 5a580ea04429..616966a96cba 100644
--- a/arch/sh/mm/cache.c
+++ b/arch/sh/mm/cache.c
@@ -95,7 +95,7 @@ void copy_user_highpage(struct page *to, struct page *from,
 {
         void *vfrom, *vto;
 
-        vto = kmap_atomic(to, KM_USER1);
+        vto = kmap_atomic(to);
 
         if (boot_cpu_data.dcache.n_aliases && page_mapped(from) &&
             test_bit(PG_dcache_clean, &from->flags)) {
@@ -103,16 +103,16 @@ void copy_user_highpage(struct page *to, struct page *from,
                 copy_page(vto, vfrom);
                 kunmap_coherent(vfrom);
         } else {
-                vfrom = kmap_atomic(from, KM_USER0);
+                vfrom = kmap_atomic(from);
                 copy_page(vto, vfrom);
-                kunmap_atomic(vfrom, KM_USER0);
+                kunmap_atomic(vfrom);
         }
 
         if (pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK) ||
             (vma->vm_flags & VM_EXEC))
                 __flush_purge_region(vto, PAGE_SIZE);
 
-        kunmap_atomic(vto, KM_USER1);
+        kunmap_atomic(vto);
         /* Make sure this page is cleared on other CPU's too before using it */
         smp_wmb();
 }
@@ -120,14 +120,14 @@ EXPORT_SYMBOL(copy_user_highpage);
 
 void clear_user_highpage(struct page *page, unsigned long vaddr)
 {
-        void *kaddr = kmap_atomic(page, KM_USER0);
+        void *kaddr = kmap_atomic(page);
 
         clear_page(kaddr);
 
         if (pages_do_alias((unsigned long)kaddr, vaddr & PAGE_MASK))
                 __flush_purge_region(kaddr, PAGE_SIZE);
 
-        kunmap_atomic(kaddr, KM_USER0);
+        kunmap_atomic(kaddr);
 }
 EXPORT_SYMBOL(clear_user_highpage);