5 files changed, 9 insertions, 10 deletions

diff --git a/arch/powerpc/include/asm/highmem.h b/arch/powerpc/include/asm/highmem.h
index dbc264010d0b..caaf6e00630d 100644
--- a/arch/powerpc/include/asm/highmem.h
+++ b/arch/powerpc/include/asm/highmem.h
@@ -79,7 +79,7 @@ static inline void kunmap(struct page *page)
         kunmap_high(page);
 }
 
-static inline void *__kmap_atomic(struct page *page)
+static inline void *kmap_atomic(struct page *page)
 {
         return kmap_atomic_prot(page, kmap_prot);
 }
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
index e2cfb9e1e20e..220fcdf26978 100644
--- a/arch/powerpc/kvm/book3s_pr.c
+++ b/arch/powerpc/kvm/book3s_pr.c
@@ -227,14 +227,14 @@ static void kvmppc_patch_dcbz(struct kvm_vcpu *vcpu, struct kvmppc_pte *pte)
         hpage_offset /= 4;
 
         get_page(hpage);
-        page = kmap_atomic(hpage, KM_USER0);
+        page = kmap_atomic(hpage);
 
         /* patch dcbz into reserved instruction, so we trap */
         for (i=hpage_offset; i < hpage_offset + (HW_PAGE_SIZE / 4); i++)
                 if ((page[i] & 0xff0007ff) == INS_DCBZ)
                         page[i] &= 0xfffffff7;
 
-        kunmap_atomic(page, KM_USER0);
+        kunmap_atomic(page);
         put_page(hpage);
 }
 
diff --git a/arch/powerpc/mm/dma-noncoherent.c b/arch/powerpc/mm/dma-noncoherent.c
index 329be36c0a8d..6747eece84af 100644
--- a/arch/powerpc/mm/dma-noncoherent.c
+++ b/arch/powerpc/mm/dma-noncoherent.c
@@ -365,12 +365,11 @@ static inline void __dma_sync_page_highmem(struct page *page,
         local_irq_save(flags);
 
         do {
-                start = (unsigned long)kmap_atomic(page + seg_nr,
-                                KM_PPC_SYNC_PAGE) + seg_offset;
+                start = (unsigned long)kmap_atomic(page + seg_nr) + seg_offset;
 
                 /* Sync this buffer segment */
                 __dma_sync((void *)start, seg_size, direction);
-                kunmap_atomic((void *)start, KM_PPC_SYNC_PAGE);
+                kunmap_atomic((void *)start);
                 seg_nr++;
 
                 /* Calculate next buffer segment size */
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index a8b3cc7d90fe..57c7465e656e 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -910,9 +910,9 @@ void flush_dcache_icache_hugepage(struct page *page)
                 if (!PageHighMem(page)) {
                         __flush_dcache_icache(page_address(page+i));
                 } else {
-                        start = kmap_atomic(page+i, KM_PPC_SYNC_ICACHE);
+                        start = kmap_atomic(page+i);
                         __flush_dcache_icache(start);
-                        kunmap_atomic(start, KM_PPC_SYNC_ICACHE);
+                        kunmap_atomic(start);
                 }
         }
 }
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index d974b79a3068..baaafde7d135 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -458,9 +458,9 @@ void flush_dcache_icache_page(struct page *page)
 #endif
 #ifdef CONFIG_BOOKE
         {
-                void *start = kmap_atomic(page, KM_PPC_SYNC_ICACHE);
+                void *start = kmap_atomic(page);
                 __flush_dcache_icache(start);
-                kunmap_atomic(start, KM_PPC_SYNC_ICACHE);
+                kunmap_atomic(start);
         }
 #elif defined(CONFIG_8xx) || defined(CONFIG_PPC64)
         /* On 8xx there is no need to kmap since highmem is not supported */