patch-2.4.20 linux-2.4.20/include/asm-mips64/scatterlist.h

• Lines: 36
• Date: Thu Nov 28 15:53:15 2002
• Orig file: linux-2.4.19/include/asm-mips64/scatterlist.h
• Orig date: Fri Aug 2 17:39:45 2002

diff -urN linux-2.4.19/include/asm-mips64/scatterlist.h linux-2.4.20/include/asm-mips64/scatterlist.h
@@ -1,21 +1,22 @@
-#ifndef __ASM_MIPS64_SCATTERLIST_H
-#define __ASM_MIPS64_SCATTERLIST_H
+#ifndef __ASM_SCATTERLIST_H
+#define __ASM_SCATTERLIST_H
 
 struct scatterlist {
-	char *  address;	/* Location data is to be transferred to */
-	struct page *page;
-	unsigned int length;
-
-	__u32 dma_address;
+	char * address;		/* Location data is to be transferred to,
+				   NULL for highmem page */
+	struct page * page;	/* Location for highmem page, if any */
+	unsigned int offset;
+	dma_addr_t dma_address;
+	unsigned long length;
 };
 
 struct mmu_sglist {
-        char *addr;
-        char *__dont_touch;
-        unsigned int len;
-        __u32 dma_addr;
+	char *addr;
+	char *__dont_touch;
+	unsigned long len;
+	dma_addr_t dvma_addr;
 };
 
-#define ISA_DMA_THRESHOLD (0x00ffffffUL)
+#define ISA_DMA_THRESHOLD (0x00ffffff)
 
-#endif /* __ASM_MIPS64_SCATTERLIST_H */
+#endif /* __ASM_SCATTERLIST_H */