1 files changed, 3 insertions, 1 deletions

diff --git a/arch/mn10300/include/asm/highmem.h b/arch/mn10300/include/asm/highmem.h
index 3817d9f34e72..bfe2d88604d9 100644
--- a/arch/mn10300/include/asm/highmem.h
+++ b/arch/mn10300/include/asm/highmem.h
@@ -101,7 +101,7 @@ static inline void __kunmap_atomic(unsigned long vaddr)
                 return;
         }
 
-        type = kmap_atomic_idx_pop();
+        type = kmap_atomic_idx();
 
 #if HIGHMEM_DEBUG
         {
@@ -119,6 +119,8 @@ static inline void __kunmap_atomic(unsigned long vaddr)
                 local_flush_tlb_one(vaddr);
         }
 #endif
+
+        kmap_atomic_idx_pop();
         pagefault_enable();
 }
 #endif /* __KERNEL__ */