diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-06-06 14:48:14 +0000 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-06-06 14:48:14 +0000 |
| commit | 0ecaac059db50e2fe79dcb71a6ce255cb69742ba (patch) | |
| tree | 6a4eca5123a8d8d1aa101279d8055cc8aa263d52 /xen/include/asm-x86/types.h | |
| parent | c00ea59fcce0b921e5c6ccf2b0d25d6d85ff745c (diff) | |
| download | xen-0ecaac059db50e2fe79dcb71a6ce255cb69742ba.tar.gz xen-0ecaac059db50e2fe79dcb71a6ce255cb69742ba.tar.bz2 xen-0ecaac059db50e2fe79dcb71a6ce255cb69742ba.zip | |
bitkeeper revision 1.1683 (42a4622ekYvso9kv8cisS5m2QiUqiQ)
Merge x86/32 and x86/64 string functions.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'xen/include/asm-x86/types.h')
| -rw-r--r-- | xen/include/asm-x86/types.h | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/xen/include/asm-x86/types.h b/xen/include/asm-x86/types.h index 55a3e0e5c9..9cec42e7a7 100644 --- a/xen/include/asm-x86/types.h +++ b/xen/include/asm-x86/types.h @@ -1,8 +1,5 @@ -#ifndef _X86_TYPES_H -#define _X86_TYPES_H - -typedef unsigned short umode_t; - +#ifndef __X86_TYPES_H__ +#define __X86_TYPES_H__ /* * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the @@ -45,7 +42,6 @@ typedef unsigned long long u64; #define BITS_PER_LONG 32 #define BYTES_PER_LONG 4 #define LONG_BYTEORDER 2 -typedef unsigned int size_t; #if defined(CONFIG_X86_PAE) typedef u64 physaddr_t; #else @@ -57,15 +53,9 @@ typedef unsigned long u64; #define BITS_PER_LONG 64 #define BYTES_PER_LONG 8 #define LONG_BYTEORDER 3 -typedef unsigned long size_t; typedef u64 physaddr_t; #endif -/* DMA addresses come in generic and 64-bit flavours. */ - -typedef unsigned long dma_addr_t; -typedef u64 dma64_addr_t; - -typedef unsigned short xmem_bufctl_t; +typedef unsigned long size_t; -#endif +#endif /* __X86_TYPES_H__ */ |