From e5521dd361a4591330116b289af13df2333544a2 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed, 28 Sep 2011 11:57:23 +0200
Subject: [PATCH] --- yaml --- r: 269826 b: refs/heads/master c:
 24dd85ff723f142093f44244764b9b5c152235b8 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/include/linux/io-mapping.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ce9f14b2d283..643337f840a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ffc02468145ac92b1b88896e0f18bd7bcd52591
+refs/heads/master: 24dd85ff723f142093f44244764b9b5c152235b8
diff --git a/trunk/include/linux/io-mapping.h b/trunk/include/linux/io-mapping.h
index 8cdcc2a199ad..1feeb5263565 100644
--- a/trunk/include/linux/io-mapping.h
+++ b/trunk/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 */