From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Tue, 1 May 2007 20:33:07 +0000 (+0200)
Subject: Convert non-highmem kmap_atomic() to static inline function
X-Git-Tag: v2.6.22-rc1~1049
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=254f9c5cd2d3b41e64f59df816630f7ca5548a8a;p=linux-2.6-omap-h63xx.git

Convert non-highmem kmap_atomic() to static inline function

Convert kmap_atomic() in the non-highmem case from a macro to a static
inline function, for better type-checking and the ability to pass void
pointers instead of struct page pointers.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index 645d440807c..7bab8eae234 100644
--- a/include/linux/highmem.h
+++ b/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)