patch-2.3.43 linux/include/asm-alpha/types.h

Next file: linux/include/asm-arm/arch-arc/time.h
Previous file: linux/include/asm-alpha/softirq.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.42/linux/include/asm-alpha/types.h linux/include/asm-alpha/types.h
@@ -25,23 +25,9 @@
 typedef __signed__ int __s32;
 typedef unsigned int __u32;
 
-/*
- * There are 32-bit compilers for the alpha out there..
- */
-#if ((~0UL) == 0xffffffff)
-
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-typedef __signed__ long long __s64;
-typedef unsigned long long __u64;
-#endif
-
-#else
-
 typedef __signed__ long __s64;
 typedef unsigned long __u64;
 
-#endif
-
 /*
  * These aren't exported outside the kernel to avoid name space clashes
  */
@@ -56,22 +42,15 @@
 typedef signed int s32;
 typedef unsigned int u32;
 
-/*
- * There are 32-bit compilers for the alpha out there..
- */
-#if ((~0UL) == 0xffffffff)
-
-typedef signed long long s64;
-typedef unsigned long long u64;
-#define BITS_PER_LONG 32
-
-#else
-
 typedef signed long s64;
 typedef unsigned long u64;
+
 #define BITS_PER_LONG 64
 
-#endif
+/* PCI dma addresses are 32-bits wide.  Ignore PCI64 for now, since
+   we'll typically be sending it all through iommu tables anyway.  */
+
+typedef u32 dma_addr_t;
 
 #endif /* __KERNEL__ */
 #endif /* _ALPHA_TYPES_H */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)