Merge tag 'msm-board-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb...

[~andy/linux] / include / asm-generic / kmap_types.h

diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
index 0232ccb76f2b18d86b15992c3c6afa45c83a3340..90f99c74dd386b5412ae36ba0a9ba6ba14e63e55 100644 (file)
--- a/include/asm-generic/kmap_types.h
+++ b/include/asm-generic/kmap_types.h
@@ -2,39 +2,9 @@
 #define _ASM_GENERIC_KMAP_TYPES_H
 
 #ifdef __WITH_KM_FENCE
-# define KMAP_D(n) __KM_FENCE_##n ,
+# define KM_TYPE_NR 41
 #else
-# define KMAP_D(n)
+# define KM_TYPE_NR 20
 #endif
 
-enum km_type {
-KMAP_D(0)      KM_BOUNCE_READ,
-KMAP_D(1)      KM_SKB_SUNRPC_DATA,
-KMAP_D(2)      KM_SKB_DATA_SOFTIRQ,
-KMAP_D(3)      KM_USER0,
-KMAP_D(4)      KM_USER1,
-KMAP_D(5)      KM_BIO_SRC_IRQ,
-KMAP_D(6)      KM_BIO_DST_IRQ,
-KMAP_D(7)      KM_PTE0,
-KMAP_D(8)      KM_PTE1,
-KMAP_D(9)      KM_IRQ0,
-KMAP_D(10)     KM_IRQ1,
-KMAP_D(11)     KM_SOFTIRQ0,
-KMAP_D(12)     KM_SOFTIRQ1,
-KMAP_D(13)     KM_SYNC_ICACHE,
-KMAP_D(14)     KM_SYNC_DCACHE,
-/* UML specific, for copy_*_user - used in do_op_one_page */
-KMAP_D(15)     KM_UML_USERCOPY,
-KMAP_D(16)     KM_IRQ_PTE,
-KMAP_D(17)     KM_NMI,
-KMAP_D(18)     KM_NMI_PTE,
-KMAP_D(19)     KM_KDB,
-/*
- * Remember to update debug_kmap_atomic() when adding new kmap types!
- */
-KMAP_D(20)     KM_TYPE_NR
-};
-
-#undef KMAP_D
-
 #endif