Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

[linux-drm-fsl-dcu.git] / include / linux / highmem.h

diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index bca8e2dfa3559352af7f38dd442dd090bf533ec3..a515eb0afdfb660a56eedd0c8928b8281fe0b5b7 100644 (file)
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -44,8 +44,13 @@ static inline void *kmap(struct page *page)
 
 #define kunmap(page) do { (void) (page); } while (0)
 
-#define kmap_atomic(page, idx) \
-       ({ pagefault_disable(); page_address(page); })
+#include <asm/kmap_types.h>
+
+static inline void *kmap_atomic(struct page *page, enum km_type idx)
+{
+       pagefault_disable();
+       return page_address(page);
+}
 #define kmap_atomic_prot(page, idx, prot)      kmap_atomic(page, idx)
 
 #define kunmap_atomic(addr, idx)       do { pagefault_enable(); } while (0)