X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=include%2Flinux%2Fio-mapping.h;h=e44e84f0156c06a8ba512b11aa38081ef323f703;hb=6aad3738f6a79fd0ca480eaceefe064cc471f6eb;hp=c81ed2ac16bd572fd4598314daa0c9e1f8d17be1;hpb=cc21fe518a971bb2b0ab8370ec46ea21e84c57ab;p=karo-tx-linux.git

diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h
index c81ed2ac16bd..e44e84f0156c 100644
--- a/include/linux/io-mapping.h
+++ b/include/linux/io-mapping.h
@@ -117,6 +117,8 @@ io_mapping_unmap(void __iomem *vaddr)
 
 #else
 
+#include <linux/uaccess.h>
+
 /* this struct isn't actually defined anywhere */
 struct io_mapping;
 
@@ -138,12 +140,14 @@ static inline void __iomem *
 io_mapping_map_atomic_wc(struct io_mapping *mapping,
 			 unsigned long offset)
 {
+	pagefault_disable();
 	return ((char __force __iomem *) mapping) + offset;
 }
 
 static inline void
 io_mapping_unmap_atomic(void __iomem *vaddr)
 {
+	pagefault_enable();
 }
 
 /* Non-atomic map/unmap */