Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[firefly-linux-kernel-4.4.55.git] / include / linux / io-mapping.h

diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h
index 657fab4efab351070a9aaf7a625759159a786580..c27dde7215b5b291394747d35e1f4a19d9f1ac8e 100644 (file)
--- a/include/linux/io-mapping.h
+++ b/include/linux/io-mapping.h
@@ -141,6 +141,7 @@ static inline void __iomem *
 io_mapping_map_atomic_wc(struct io_mapping *mapping,
                         unsigned long offset)
 {
+       preempt_disable();
        pagefault_disable();
        return ((char __force __iomem *) mapping) + offset;
 }
@@ -149,6 +150,7 @@ static inline void
 io_mapping_unmap_atomic(void __iomem *vaddr)
 {
        pagefault_enable();
+       preempt_enable();
 }
 
 /* Non-atomic map/unmap */