patch-2.4.13 linux/include/asm-alpha/scatterlist.h

• Lines: 35
• Date: Fri Oct 12 15:35:54 2001
• Orig file: v2.4.12/linux/include/asm-alpha/scatterlist.h
• Orig date: Mon Feb 7 20:09:05 2000

diff -u --recursive --new-file v2.4.12/linux/include/asm-alpha/scatterlist.h linux/include/asm-alpha/scatterlist.h
@@ -1,19 +1,25 @@
 #ifndef _ALPHA_SCATTERLIST_H
 #define _ALPHA_SCATTERLIST_H
 
-#include <linux/types.h>
-
+#include <asm/page.h>
+  
 struct scatterlist {
-	char *address;			/* Source/target vaddr.  */
-	char *alt_address;		/* Location of actual if address is a
-					   dma indirect buffer, else NULL.  */
-	dma_addr_t dma_address;
+	/* This will disappear in 2.5.x */
+	char *address;
+
+	/* These two are only valid if ADDRESS member of this
+	   struct is NULL.  */
+	struct page *page;
+	unsigned int offset;
+
 	unsigned int length;
-	unsigned int dma_length;
+
+	dma_addr_t dma_address;
+	__u32 dma_length;
 };
 
-#define sg_dma_address(sg) ((sg)->dma_address)
-#define sg_dma_len(sg)     ((sg)->dma_length)
+#define sg_dma_address(sg)	((sg)->dma_address)
+#define sg_dma_len(sg)		((sg)->dma_length)
 
 #define ISA_DMA_THRESHOLD (~0UL)