Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / arch / sh / mm / kmap.c

diff --git a/kernel/arch/sh/mm/kmap.c b/kernel/arch/sh/mm/kmap.c
index ec29e14..bf25d7c 100644 (file)
--- a/kernel/arch/sh/mm/kmap.c
+++ b/kernel/arch/sh/mm/kmap.c
@@ -36,6 +36,7 @@ void *kmap_coherent(struct page *page, unsigned long addr)
 
        BUG_ON(!test_bit(PG_dcache_clean, &page->flags));
 
+       preempt_disable();
        pagefault_disable();
 
        idx = FIX_CMAP_END -
@@ -64,4 +65,5 @@ void kunmap_coherent(void *kvaddr)
        }
 
        pagefault_enable();
+       preempt_enable();
 }