patch-2.4.13 linux/include/asm-i386/types.h

Next file: linux/include/asm-i386/unistd.h
Previous file: linux/include/asm-i386/system.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.12/linux/include/asm-i386/types.h linux/include/asm-i386/types.h
@@ -27,6 +27,8 @@
  */
 #ifdef __KERNEL__
 
+#include <linux/config.h>
+
 typedef signed char s8;
 typedef unsigned char u8;
 
@@ -41,9 +43,14 @@
 
 #define BITS_PER_LONG 32
 
-/* Dma addresses are 32-bits wide.  */
+/* DMA addresses come in generic and 64-bit flavours.  */
 
+#ifdef CONFIG_HIGHMEM
+typedef u64 dma_addr_t;
+#else
 typedef u32 dma_addr_t;
+#endif
+typedef u64 dma64_addr_t;
 
 #endif /* __KERNEL__ */
 

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