1 files changed, 3 insertions, 0 deletions

diff --git a/arch/arm/mm/highmem.c b/arch/arm/mm/highmem.c
index b98895d9fe57..ee8dfa793989 100644
--- a/arch/arm/mm/highmem.c
+++ b/arch/arm/mm/highmem.c
@@ -59,6 +59,7 @@ void *kmap_atomic(struct page *page)
         void *kmap;
         int type;
 
+        preempt_disable();
         pagefault_disable();
         if (!PageHighMem(page))
                 return page_address(page);
@@ -121,6 +122,7 @@ void __kunmap_atomic(void *kvaddr)
                 kunmap_high(pte_page(pkmap_page_table[PKMAP_NR(vaddr)]));
         }
         pagefault_enable();
+        preempt_enable();
 }
 EXPORT_SYMBOL(__kunmap_atomic);
 
@@ -130,6 +132,7 @@ void *kmap_atomic_pfn(unsigned long pfn)
         int idx, type;
         struct page *page = pfn_to_page(pfn);
 
+        preempt_disable();
         pagefault_disable();
         if (!PageHighMem(page))
                 return page_address(page);