patch-2.4.19 linux-2.4.19/include/asm-mips/types.h

• Lines: 36
• Date: Fri Aug 2 17:39:45 2002
• Orig file: linux-2.4.18/include/asm-mips/types.h
• Orig date: Sun Jul 9 22:18:15 2000

diff -urN linux-2.4.18/include/asm-mips/types.h linux-2.4.19/include/asm-mips/types.h
@@ -1,5 +1,4 @@
-/* $Id: types.h,v 1.3 1999/08/18 23:37:50 ralf Exp $
- *
+/*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
@@ -10,6 +9,8 @@
 #ifndef _ASM_TYPES_H
 #define _ASM_TYPES_H
 
+#include <linux/config.h>
+
 typedef unsigned short umode_t;
 
 /*
@@ -70,7 +71,18 @@
 
 #define BITS_PER_LONG _MIPS_SZLONG
 
-typedef unsigned long dma_addr_t;
+#ifdef CONFIG_64BIT_PHYS_ADDR
+typedef u32 dma_addr_t;
+#else
+typedef u64 dma_addr_t;
+#endif
+typedef u64 dma64_addr_t;
+
+#ifdef CONFIG_64BIT_PHYS_ADDR
+typedef unsigned long long phys_t;
+#else
+typedef unsigned long phys_t;
+#endif
 
 #endif /* __KERNEL__ */