1 files changed, 4 insertions, 3 deletions

diff --git a/arch/i386/mm/highmem.c b/arch/i386/mm/highmem.c
index e0fa6cb655a..bb2de1089ad 100644
--- a/arch/i386/mm/highmem.c
+++ b/arch/i386/mm/highmem.c
@@ -33,13 +33,14 @@ void *kmap_atomic(struct page *page, enum km_type type)
 
         /* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
         pagefault_disable();
+
+        idx = type + KM_TYPE_NR*smp_processor_id();
+        BUG_ON(!pte_none(*(kmap_pte-idx)));
+
         if (!PageHighMem(page))
                 return page_address(page);
 
-        idx = type + KM_TYPE_NR*smp_processor_id();
         vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
-        if (!pte_none(*(kmap_pte-idx)))
-                BUG();
         set_pte(kmap_pte-idx, mk_pte(page, kmap_prot));
 
         return (void*) vaddr;