patch-2.4.18 linux/include/asm-s390/scatterlist.h

Next file: linux/include/asm-s390/setup.h
Previous file: linux/include/asm-s390/s390-gdbregs.h
Back to the patch index
Back to the overall index

diff -Naur -X /home/marcelo/lib/dontdiff linux.orig/include/asm-s390/scatterlist.h linux/include/asm-s390/scatterlist.h
@@ -1,8 +1,16 @@
-#ifndef _ASMS390X_SCATTERLIST_H
-#define _ASMS390X_SCATTERLIST_H
+#ifndef _ASMS390_SCATTERLIST_H
+#define _ASMS390_SCATTERLIST_H
 
 struct scatterlist {
-    char *  address;    /* Location data is to be transferred to */
+    /* 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;
 };
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)