x86: types: use <asm-generic/int-*.h> for the x86 architecture

[linux-2.6-omap-h63xx.git] / include / asm-x86 / types.h

diff --git a/include/asm-x86/types.h b/include/asm-x86/types.h
index a777a9b839742f5c447bd4d933a905582c107f47..1ac80cd9acf8599a143ce5cf98913b91a668eda7 100644 (file)
--- a/include/asm-x86/types.h
+++ b/include/asm-x86/types.h
@@ -1,13 +1,36 @@
+#ifndef _ASM_X86_TYPES_H
+#define _ASM_X86_TYPES_H
+
+#include <asm-generic/int-ll64.h>
+
+#ifndef __ASSEMBLY__
+
+typedef unsigned short umode_t;
+
+#endif /* __ASSEMBLY__ */
+
+/*
+ * These aren't exported outside the kernel to avoid name space clashes
+ */
 #ifdef __KERNEL__
-# ifdef CONFIG_X86_32
-#  include "types_32.h"
-# else
-#  include "types_64.h"
-# endif
+
+#ifdef CONFIG_X86_32
+# define BITS_PER_LONG 32
 #else
-# ifdef __i386__
-#  include "types_32.h"
-# else
-#  include "types_64.h"
-# endif
+# define BITS_PER_LONG 64
+#endif
+
+#ifndef __ASSEMBLY__
+
+typedef u64 dma64_addr_t;
+#if defined(CONFIG_X86_64) || defined(CONFIG_HIGHMEM64G)
+/* DMA addresses come in 32-bit and 64-bit flavours. */
+typedef u64 dma_addr_t;
+#else
+typedef u32 dma_addr_t;
+#endif
+
+#endif /* __ASSEMBLY__ */
+#endif /* __KERNEL__ */
+
 #endif