Merge branch 'linus' into perfcounters/core

[cascardo/linux.git] / include / asm-generic / kmap_types.h

diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
index 58c3305..eddbce0 100644 (file)
--- a/include/asm-generic/kmap_types.h
+++ b/include/asm-generic/kmap_types.h
@@ -1,7 +1,7 @@
 #ifndef _ASM_GENERIC_KMAP_TYPES_H
 #define _ASM_GENERIC_KMAP_TYPES_H
 
-#ifdef CONFIG_DEBUG_HIGHMEM
+#ifdef __WITH_KM_FENCE
 # define D(n) __KM_FENCE_##n ,
 #else
 # define D(n)
@@ -24,7 +24,10 @@ D(12)        KM_SOFTIRQ1,
 D(13)  KM_SYNC_ICACHE,
 D(14)  KM_SYNC_DCACHE,
 D(15)  KM_UML_USERCOPY, /* UML specific, for copy_*_user - used in do_op_one_page */
-D(16)  KM_TYPE_NR
+D(16)  KM_IRQ_PTE,
+D(17)  KM_NMI,
+D(18)  KM_NMI_PTE,
+D(19)  KM_TYPE_NR
 };
 
 #undef D