From 4e3344476e15e833e954045e648d098e1e2a9a56 Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@kernel.crashing.org>
Date: Wed, 1 Apr 2009 23:38:49 -0500
Subject: [PATCH] --- yaml --- r: 139999 b: refs/heads/master c:
 3688e07f83d81941c4a8b20e29602c6d0c883539 h: refs/heads/master i:   139997:
 ae87a148162d8cda0504ac2e99f7e7c98c82ea12   139995:
 84be81f70c1f3243a68b5004d8d2448f141320e9   139991:
 ba708384d9d7e1387c3a4c72100572c6aed582c2   139983:
 f03ddde560172dea246d30b804a5090fc373c480   139967:
 4da5d68d09e3b4bcc97c339a604c7ea825bde090 v: v3

---
 [refs]                        |  2 +-
 trunk/include/linux/highmem.h | 29 ++++++++++++++---------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 094f089477df..7c31c53d6e75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c54c4dec61eec88de8260a00260fe89aa538f267
+refs/heads/master: 3688e07f83d81941c4a8b20e29602c6d0c883539
diff --git a/trunk/include/linux/highmem.h b/trunk/include/linux/highmem.h
index 7ff5c55f9b55..1fcb7126a01f 100644
--- a/trunk/include/linux/highmem.h
+++ b/trunk/include/linux/highmem.h
@@ -19,8 +19,21 @@ static inline void flush_kernel_dcache_page(struct page *page)
 }
 #endif
 
-#ifdef CONFIG_HIGHMEM
+#include <asm/kmap_types.h>
+
+#if defined(CONFIG_DEBUG_HIGHMEM) && defined(CONFIG_TRACE_IRQFLAGS_SUPPORT)
+
+void debug_kmap_atomic(enum km_type type);
+
+#else
 
+static inline void debug_kmap_atomic(enum km_type type)
+{
+}
+
+#endif
+
+#ifdef CONFIG_HIGHMEM
 #include <asm/highmem.h>
 
 /* declarations for linux/mm/highmem.c */
@@ -44,8 +57,6 @@ static inline void *kmap(struct page *page)
 
 #define kunmap(page) do { (void) (page); } while (0)
 
-#include <asm/kmap_types.h>
-
 static inline void *kmap_atomic(struct page *page, enum km_type idx)
 {
 	pagefault_disable();
@@ -187,16 +198,4 @@ static inline void copy_highpage(struct page *to, struct page *from)
 	kunmap_atomic(vto, KM_USER1);
 }
 
-#if defined(CONFIG_DEBUG_HIGHMEM) && defined(CONFIG_TRACE_IRQFLAGS_SUPPORT)
-
-void debug_kmap_atomic(enum km_type type);
-
-#else
-
-static inline void debug_kmap_atomic(enum km_type type)
-{
-}
-
-#endif
-
 #endif /* _LINUX_HIGHMEM_H */