1 files changed, 3 insertions, 1 deletions

diff --git a/arch/sparc/mm/highmem.c b/arch/sparc/mm/highmem.c
index 5e50c09b7dce..4730eac0747b 100644
--- a/arch/sparc/mm/highmem.c
+++ b/arch/sparc/mm/highmem.c
@@ -75,7 +75,7 @@ void __kunmap_atomic(void *kvaddr)
                 return;
         }
 
-        type = kmap_atomic_idx_pop();
+        type = kmap_atomic_idx();
 
 #ifdef CONFIG_DEBUG_HIGHMEM
         {
@@ -104,6 +104,8 @@ void __kunmap_atomic(void *kvaddr)
 #endif
         }
 #endif
+
+        kmap_atomic_idx_pop();
         pagefault_enable();
 }
 EXPORT_SYMBOL(__kunmap_atomic);