Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[linux-2.6/linux-mips/linux-dm7025.git] / include / asm-x86 / types.h
blob1ac80cd9acf8599a143ce5cf98913b91a668eda7
1 #ifndef _ASM_X86_TYPES_H
2 #define _ASM_X86_TYPES_H
4 #include <asm-generic/int-ll64.h>
6 #ifndef __ASSEMBLY__
8 typedef unsigned short umode_t;
10 #endif /* __ASSEMBLY__ */
13 * These aren't exported outside the kernel to avoid name space clashes
15 #ifdef __KERNEL__
17 #ifdef CONFIG_X86_32
18 # define BITS_PER_LONG 32
19 #else
20 # define BITS_PER_LONG 64
21 #endif
23 #ifndef __ASSEMBLY__
25 typedef u64 dma64_addr_t;
26 #if defined(CONFIG_X86_64) || defined(CONFIG_HIGHMEM64G)
27 /* DMA addresses come in 32-bit and 64-bit flavours. */
28 typedef u64 dma_addr_t;
29 #else
30 typedef u32 dma_addr_t;
31 #endif
33 #endif /* __ASSEMBLY__ */
34 #endif /* __KERNEL__ */
36 #endif