1 files changed, 3 insertions, 2 deletions

diff --git a/arch/tile/mm/highmem.c b/arch/tile/mm/highmem.c
index 8ef6595e162c..31dbbd9afe47 100644
--- a/arch/tile/mm/highmem.c
+++ b/arch/tile/mm/highmem.c
@@ -227,7 +227,7 @@ EXPORT_SYMBOL(kmap_atomic_prot);
 void *__kmap_atomic(struct page *page)
 {
         /* PAGE_NONE is a magic value that tells us to check immutability. */
-        return kmap_atomic_prot(page, type, PAGE_NONE);
+        return kmap_atomic_prot(page, PAGE_NONE);
 }
 EXPORT_SYMBOL(__kmap_atomic);
 
@@ -241,7 +241,7 @@ void __kunmap_atomic(void *kvaddr)
                 pte_t pteval = *pte;
                 int idx, type;
 
-                type = kmap_atomic_idx_pop();
+                type = kmap_atomic_idx();
                 idx = type + KM_TYPE_NR*smp_processor_id();
 
                 /*
@@ -252,6 +252,7 @@ void __kunmap_atomic(void *kvaddr)
                 BUG_ON(!pte_present(pteval) && !pte_migrating(pteval));
                 kmap_atomic_unregister(pte_page(pteval), vaddr);
                 kpte_clear_flush(pte, vaddr);
+                kmap_atomic_idx_pop();
         } else {
                 /* Must be a lowmem page */
                 BUG_ON(vaddr < PAGE_OFFSET);