patch-2.4.15 linux/include/asm-ia64/scatterlist.h

• Lines: 24
• Date: Tue Nov 13 09:01:16 2001
• Orig file: v2.4.14/linux/include/asm-ia64/scatterlist.h
• Orig date: Tue Oct 23 22:48:53 2001

diff -u --recursive --new-file v2.4.14/linux/include/asm-ia64/scatterlist.h linux/include/asm-ia64/scatterlist.h
@@ -2,13 +2,19 @@
 #define _ASM_IA64_SCATTERLIST_H
 
 /*
- * Copyright (C) 1998, 1999 Hewlett-Packard Co
- * Copyright (C) 1998, 1999 David Mosberger-Tang <davidm@hpl.hp.com>
+ * Copyright (C) 1998, 1999, 2001 Hewlett-Packard Co
+ *	David Mosberger-Tang <davidm@hpl.hp.com>
  */
 
 struct scatterlist {
-	char *address;		/* location data is to be transferred to */
-	char *orig_address;	/* Save away the original buffer address (used by pci-dma.c) */
+	/* This will disappear in 2.5.x: */
+	char *address;		/* location data is to be transferred to, NULL for highmem page */
+	char *orig_address;	/* for use by swiotlb */
+
+	/* These two are only valid if ADDRESS member of this struct is NULL.  */
+	struct page *page;
+	unsigned int offset;
+
 	unsigned int length;	/* buffer length */
 };