patch-2.4.20 linux-2.4.20/include/asm-mips/types.h
Next file: linux-2.4.20/include/asm-mips/umap.h
Previous file: linux-2.4.20/include/asm-mips/timex.h
Back to the patch index
Back to the overall index
- Lines: 29
- Date:
Thu Nov 28 15:53:15 2002
- Orig file:
linux-2.4.19/include/asm-mips/types.h
- Orig date:
Fri Aug 2 17:39:45 2002
diff -urN linux-2.4.19/include/asm-mips/types.h linux-2.4.20/include/asm-mips/types.h
@@ -33,12 +33,12 @@
typedef unsigned long __u64;
#else
-
+
#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
typedef __signed__ long long __s64;
typedef unsigned long long __u64;
#endif
-
+
#endif
/*
@@ -71,10 +71,10 @@
#define BITS_PER_LONG _MIPS_SZLONG
-#ifdef CONFIG_64BIT_PHYS_ADDR
-typedef u32 dma_addr_t;
-#else
+#if defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)
typedef u64 dma_addr_t;
+#else
+typedef u32 dma_addr_t;
#endif
typedef u64 dma64_addr_t;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)