---

yaml --- r: 71041 b: refs/heads/master c: c4ac82a h: refs/heads/master i: 71039: 0581a9e v: v3
git-mirror · Oct 17, 2007 · 865b478 · 865b478
1 parent 0b754a9
commit 865b478
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 53 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35cc46119d256364f179d7b3554f06ba468af3f7
+refs/heads/master: c4ac82a8818c6decd0fa57cdb55d4225f43d923a
diff --git a/trunk/include/asm-x86/kmap_types.h b/trunk/include/asm-x86/kmap_types.h
@@ -1,5 +1,29 @@
-#ifdef CONFIG_X86_32
-# include "kmap_types_32.h"
+#ifndef _ASM_X86_KMAP_TYPES_H
+#define _ASM_X86_KMAP_TYPES_H
+
+#if defined(CONFIG_X86_32) && defined(CONFIG_DEBUG_HIGHMEM)
+# define D(n) __KM_FENCE_##n ,
 #else
-# include "kmap_types_64.h"
+# define D(n)
+#endif
+
+enum km_type {
+D(0)	KM_BOUNCE_READ,
+D(1)	KM_SKB_SUNRPC_DATA,
+D(2)	KM_SKB_DATA_SOFTIRQ,
+D(3)	KM_USER0,
+D(4)	KM_USER1,
+D(5)	KM_BIO_SRC_IRQ,
+D(6)	KM_BIO_DST_IRQ,
+D(7)	KM_PTE0,
+D(8)	KM_PTE1,
+D(9)	KM_IRQ0,
+D(10)	KM_IRQ1,
+D(11)	KM_SOFTIRQ0,
+D(12)	KM_SOFTIRQ1,
+D(13)	KM_TYPE_NR
+};
+
+#undef D
+
 #endif
diff --git a/trunk/include/asm-x86/kmap_types_32.h b/trunk/include/asm-x86/kmap_types_32.h
diff --git a/trunk/include/asm-x86/kmap_types_64.h b/trunk/include/asm-x86/kmap_types_64.h