diff options
Diffstat (limited to 'include/linux/io-mapping.h')
-rw-r--r-- | include/linux/io-mapping.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h index 657fab4efab3..c27dde7215b5 100644 --- a/include/linux/io-mapping.h +++ b/include/linux/io-mapping.h | |||
@@ -141,6 +141,7 @@ static inline void __iomem * | |||
141 | io_mapping_map_atomic_wc(struct io_mapping *mapping, | 141 | io_mapping_map_atomic_wc(struct io_mapping *mapping, |
142 | unsigned long offset) | 142 | unsigned long offset) |
143 | { | 143 | { |
144 | preempt_disable(); | ||
144 | pagefault_disable(); | 145 | pagefault_disable(); |
145 | return ((char __force __iomem *) mapping) + offset; | 146 | return ((char __force __iomem *) mapping) + offset; |
146 | } | 147 | } |
@@ -149,6 +150,7 @@ static inline void | |||
149 | io_mapping_unmap_atomic(void __iomem *vaddr) | 150 | io_mapping_unmap_atomic(void __iomem *vaddr) |
150 | { | 151 | { |
151 | pagefault_enable(); | 152 | pagefault_enable(); |
153 | preempt_enable(); | ||
152 | } | 154 | } |
153 | 155 | ||
154 | /* Non-atomic map/unmap */ | 156 | /* Non-atomic map/unmap */ |