projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'gta02-audio' into for-2.6.32
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
include
/
asm-generic
/
kmap_types.h
diff --git
a/include/asm-generic/kmap_types.h
b/include/asm-generic/kmap_types.h
index 54e8b3d956b7fe9ba20082844b50237d27050681..eddbce0f9fb9447f8fae3534ed0a0d3f4373dc7f 100644
(file)
--- a/
include/asm-generic/kmap_types.h
+++ b/
include/asm-generic/kmap_types.h
@@
-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