[PATCH V2 1/2] mm/highmem: Remove deprecated kmap_atomic

[ira . weiny]

From: Ira Weiny <ira.we...@intel.com>

kmap_atomic() is being deprecated in favor of kmap_local_page().

Replace the uses of kmap_atomic() within the highmem code.

Signed-off-by: Ira Weiny <ira.we...@intel.com>
---
 include/linux/highmem.h | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index f597830f26b4..3bfe6a12d14d 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -146,9 +146,9 @@ static inline void invalidate_kernel_vmap_range(void 
*vaddr, int size)
 #ifndef clear_user_highpage
 static inline void clear_user_highpage(struct page *page, unsigned long vaddr)
 {
-       void *addr = kmap_atomic(page);
+       void *addr = kmap_local_page(page);
        clear_user_page(addr, vaddr, page);
-       kunmap_atomic(addr);
+       kunmap_local(addr);
 }
 #endif
 
@@ -199,16 +199,16 @@ alloc_zeroed_user_highpage_movable(struct vm_area_struct 
*vma,
 
 static inline void clear_highpage(struct page *page)
 {
-       void *kaddr = kmap_atomic(page);
+       void *kaddr = kmap_local_page(page);
        clear_page(kaddr);
-       kunmap_atomic(kaddr);
+       kunmap_local(kaddr);
 }
 
 static inline void zero_user_segments(struct page *page,
        unsigned start1, unsigned end1,
        unsigned start2, unsigned end2)
 {
-       void *kaddr = kmap_atomic(page);
+       void *kaddr = kmap_local_page(page);
 
        BUG_ON(end1 > PAGE_SIZE || end2 > PAGE_SIZE);
 
@@ -218,7 +218,7 @@ static inline void zero_user_segments(struct page *page,
        if (end2 > start2)
                memset(kaddr + start2, 0, end2 - start2);
 
-       kunmap_atomic(kaddr);
+       kunmap_local(kaddr);
        flush_dcache_page(page);
 }
 
@@ -241,11 +241,11 @@ static inline void copy_user_highpage(struct page *to, 
struct page *from,
 {
        char *vfrom, *vto;
 
-       vfrom = kmap_atomic(from);
-       vto = kmap_atomic(to);
+       vfrom = kmap_local_page(from);
+       vto = kmap_local_page(to);
        copy_user_page(vto, vfrom, vaddr, to);
-       kunmap_atomic(vto);
-       kunmap_atomic(vfrom);
+       kunmap_local(vto);
+       kunmap_local(vfrom);
 }
 
 #endif
@@ -256,11 +256,11 @@ static inline void copy_highpage(struct page *to, struct 
page *from)
 {
        char *vfrom, *vto;
 
-       vfrom = kmap_atomic(from);
-       vto = kmap_atomic(to);
+       vfrom = kmap_local_page(from);
+       vto = kmap_local_page(to);
        copy_page(vto, vfrom);
-       kunmap_atomic(vto);
-       kunmap_atomic(vfrom);
+       kunmap_local(vto);
+       kunmap_local(vfrom);
 }
 
 #endif
-- 
2.28.0.rc0.12.gb6a658bd00c9