Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[mv-sheeva.git] / include / asm-s390 / scatterlist.h

diff --git a/include/asm-s390/scatterlist.h b/include/asm-s390/scatterlist.h
index eb3948690d6e4c4895451303ba32e16d7c739323..29ec8e28c8df375f1aa13e12b9edf2fa89752831 100644 (file)
--- a/include/asm-s390/scatterlist.h
+++ b/include/asm-s390/scatterlist.h
@@ -2,6 +2,9 @@
 #define _ASMS390_SCATTERLIST_H
 
 struct scatterlist {
+#ifdef CONFIG_DEBUG_SG
+    unsigned long sg_magic;
+#endif
     unsigned long page_link;
     unsigned int offset;
     unsigned int length;