diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-15 23:28:20 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 20:26:13 +0200 |
| commit | c4ac82a8818c6decd0fa57cdb55d4225f43d923a (patch) | |
| tree | 20baca59d2c0ab7bc06d14ca67af8555ec3e9ed1 /include/asm-x86/kmap_types.h | |
| parent | 35cc46119d256364f179d7b3554f06ba468af3f7 (diff) | |
x86: unify include/asm/agp_32/64.h
The 32bit D(n) debug addon can be made exclusive for 32 bit compiles.
Otherwise all the same.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86/kmap_types.h')
| -rw-r--r-- | include/asm-x86/kmap_types.h | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/include/asm-x86/kmap_types.h b/include/asm-x86/kmap_types.h index e4ec724b298..5f4174132a2 100644 --- a/include/asm-x86/kmap_types.h +++ b/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 |