diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 14:59:11 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 14:59:11 -0700 |
commit | 2b12a4c524812fb3f6ee590a02e65b95c8c32229 (patch) | |
tree | 6d319a371c56798d2d5c3ad21801eba142a1c77e /arch/ia64/include/asm/kmap_types.h | |
parent | 4744b43431e8613f920c5cba88346756f53c5165 (diff) | |
parent | 7f30491ccd28627742e37899453ae20e3da8e18f (diff) |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Move include/asm-ia64 to arch/ia64/include/asm
Diffstat (limited to 'arch/ia64/include/asm/kmap_types.h')
-rw-r--r-- | arch/ia64/include/asm/kmap_types.h | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/kmap_types.h b/arch/ia64/include/asm/kmap_types.h new file mode 100644 index 00000000000..5d1658aa2b3 --- /dev/null +++ b/arch/ia64/include/asm/kmap_types.h @@ -0,0 +1,30 @@ +#ifndef _ASM_IA64_KMAP_TYPES_H +#define _ASM_IA64_KMAP_TYPES_H + + +#ifdef CONFIG_DEBUG_HIGHMEM +# define D(n) __KM_FENCE_##n , +#else +# 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 /* _ASM_IA64_KMAP_TYPES_H */ |