1 files changed, 3 insertions, 1 deletions

diff --git a/arch/powerpc/mm/highmem.c b/arch/powerpc/mm/highmem.c
index b0848b462bbc..e7450bdbe83a 100644
--- a/arch/powerpc/mm/highmem.c
+++ b/arch/powerpc/mm/highmem.c
@@ -62,7 +62,7 @@ void __kunmap_atomic(void *kvaddr)
                 return;
         }
 
-        type = kmap_atomic_idx_pop();
+        type = kmap_atomic_idx();
 
 #ifdef CONFIG_DEBUG_HIGHMEM
         {
@@ -79,6 +79,8 @@ void __kunmap_atomic(void *kvaddr)
                 local_flush_tlb_page(NULL, vaddr);
         }
 #endif
+
+        kmap_atomic_idx_pop();
         pagefault_enable();
 }
 EXPORT_SYMBOL(__kunmap_atomic);