git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
include
/
linux
/
io-mapping.h
diff --git
a/include/linux/io-mapping.h
b/include/linux/io-mapping.h
index
c81ed2a
..
e44e84f
100644
(file)
--- a/
include/linux/io-mapping.h
+++ b/
include/linux/io-mapping.h
@@
-117,6
+117,8
@@
io_mapping_unmap(void __iomem *vaddr)
#else
#else
+#include <linux/uaccess.h>
+
/* this struct isn't actually defined anywhere */
struct io_mapping;
/* 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)
{
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)
{
return ((char __force __iomem *) mapping) + offset;
}
static inline void
io_mapping_unmap_atomic(void __iomem *vaddr)
{
+ pagefault_enable();
}
/* Non-atomic map/unmap */
}
/* Non-atomic map/unmap */