diff --git a/[refs] b/[refs]
index dd0bd240885d..51c26d7e9bdd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5456e040eaac7eb9545d49c38984af2047699be
+refs/heads/master: 254f9c5cd2d3b41e64f59df816630f7ca5548a8a
diff --git a/trunk/include/linux/highmem.h b/trunk/include/linux/highmem.h
index 645d440807c2..7bab8eae2341 100644
--- a/trunk/include/linux/highmem.h
+++ b/trunk/include/linux/highmem.h
@@ -42,8 +42,14 @@ 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 kunmap_atomic(addr, idx)	do { pagefault_enable(); } while (0)
 #define kmap_atomic_pfn(pfn, idx)	kmap_atomic(pfn_to_page(pfn), (idx))
 #define kmap_atomic_to_page(ptr)	virt_to_page(ptr)