[openib-general] [PATCH] ofed 1.2: fix module compilation erros on ia64

[Yosef Etigin]

Fix compilation errors on ia64 that are caused by the definition of
sg_dma_address and sg_dma_len in asm-ia64/pci.h instead of in
asm/scatterlist.h, as in other architectures.

tested on: ia64[sles10]; x86_64 [sles10,rh4]

Signed-off by: Yosef Etigin <yosefe at voltaire.com>

---
diff -urN a/kernel_addons/backport/2.6.11/include/asm/scatterlist.h b/kernel_addons/backport/2.6.11/include/asm/scatterlist.h
--- a/kernel_addons/backport/2.6.11/include/asm/scatterlist.h	1970-01-01 02:00:00.000000000 +0200
+++ b/kernel_addons/backport/2.6.11/include/asm/scatterlist.h	2006-12-26 16:07:21.000000000 +0200
@@ -0,0 +1,12 @@
+/* fix sg_dma_len in ia64 being in pci.h instead of scatterlist.h */
+#ifndef BACKPORT_SCATTERLIST_H
+#define BACKPORT_SCATTERLIST_H
+
+#include_next <asm/scatterlist.h>
+
+#ifdef __ia64__
+#define sg_dma_address(sg)     ((sg)->dma_address)
+#define sg_dma_len(sg)         ((sg)->dma_length)
+#endif
+
+#endif
diff -urN a/kernel_addons/backport/2.6.11_FC4/include/asm/scatterlist.h b/kernel_addons/backport/2.6.11_FC4/include/asm/scatterlist.h
--- a/kernel_addons/backport/2.6.11_FC4/include/asm/scatterlist.h	1970-01-01 02:00:00.000000000 +0200
+++ b/kernel_addons/backport/2.6.11_FC4/include/asm/scatterlist.h	2006-12-26 16:07:21.000000000 +0200
@@ -0,0 +1,12 @@
+/* fix sg_dma_len in ia64 being in pci.h instead of scatterlist.h */
+#ifndef BACKPORT_SCATTERLIST_H
+#define BACKPORT_SCATTERLIST_H
+
+#include_next <asm/scatterlist.h>
+
+#ifdef __ia64__
+#define sg_dma_address(sg)     ((sg)->dma_address)
+#define sg_dma_len(sg)         ((sg)->dma_length)
+#endif
+
+#endif
diff -urN a/kernel_addons/backport/2.6.12/include/asm/scatterlist.h b/kernel_addons/backport/2.6.12/include/asm/scatterlist.h
--- a/kernel_addons/backport/2.6.12/include/asm/scatterlist.h	1970-01-01 02:00:00.000000000 +0200
+++ b/kernel_addons/backport/2.6.12/include/asm/scatterlist.h	2006-12-26 16:07:21.000000000 +0200
@@ -0,0 +1,12 @@
+/* fix sg_dma_len in ia64 being in pci.h instead of scatterlist.h */
+#ifndef BACKPORT_SCATTERLIST_H
+#define BACKPORT_SCATTERLIST_H
+
+#include_next <asm/scatterlist.h>
+
+#ifdef __ia64__
+#define sg_dma_address(sg)     ((sg)->dma_address)
+#define sg_dma_len(sg)         ((sg)->dma_length)
+#endif
+
+#endif
diff -urN a/kernel_addons/backport/2.6.13/include/asm/scatterlist.h b/kernel_addons/backport/2.6.13/include/asm/scatterlist.h
--- a/kernel_addons/backport/2.6.13/include/asm/scatterlist.h	1970-01-01 02:00:00.000000000 +0200
+++ b/kernel_addons/backport/2.6.13/include/asm/scatterlist.h	2006-12-26 16:07:21.000000000 +0200
@@ -0,0 +1,12 @@
+/* fix sg_dma_len in ia64 being in pci.h instead of scatterlist.h */
+#ifndef BACKPORT_SCATTERLIST_H
+#define BACKPORT_SCATTERLIST_H
+
+#include_next <asm/scatterlist.h>
+
+#ifdef __ia64__
+#define sg_dma_address(sg)     ((sg)->dma_address)
+#define sg_dma_len(sg)         ((sg)->dma_length)
+#endif
+
+#endif
diff -urN a/kernel_addons/backport/2.6.13_suse10_0_u/include/asm/scatterlist.h b/kernel_addons/backport/2.6.13_suse10_0_u/include/asm/scatterlist.h
--- a/kernel_addons/backport/2.6.13_suse10_0_u/include/asm/scatterlist.h	1970-01-01 02:00:00.000000000 +0200
+++ b/kernel_addons/backport/2.6.13_suse10_0_u/include/asm/scatterlist.h	2006-12-26 16:07:21.000000000 +0200
@@ -0,0 +1,12 @@
+/* fix sg_dma_len in ia64 being in pci.h instead of scatterlist.h */
+#ifndef BACKPORT_SCATTERLIST_H
+#define BACKPORT_SCATTERLIST_H
+
+#include_next <asm/scatterlist.h>
+
+#ifdef __ia64__
+#define sg_dma_address(sg)     ((sg)->dma_address)
+#define sg_dma_len(sg)         ((sg)->dma_length)
+#endif
+
+#endif
diff -urN a/kernel_addons/backport/2.6.14/include/asm/scatterlist.h b/kernel_addons/backport/2.6.14/include/asm/scatterlist.h
--- a/kernel_addons/backport/2.6.14/include/asm/scatterlist.h	1970-01-01 02:00:00.000000000 +0200
+++ b/kernel_addons/backport/2.6.14/include/asm/scatterlist.h	2006-12-26 16:07:21.000000000 +0200
@@ -0,0 +1,12 @@
+/* fix sg_dma_len in ia64 being in pci.h instead of scatterlist.h */
+#ifndef BACKPORT_SCATTERLIST_H
+#define BACKPORT_SCATTERLIST_H
+
+#include_next <asm/scatterlist.h>
+
+#ifdef __ia64__
+#define sg_dma_address(sg)     ((sg)->dma_address)
+#define sg_dma_len(sg)         ((sg)->dma_length)
+#endif
+
+#endif
diff -urN a/kernel_addons/backport/2.6.15/include/asm/scatterlist.h b/kernel_addons/backport/2.6.15/include/asm/scatterlist.h
--- a/kernel_addons/backport/2.6.15/include/asm/scatterlist.h	1970-01-01 02:00:00.000000000 +0200
+++ b/kernel_addons/backport/2.6.15/include/asm/scatterlist.h	2006-12-26 16:07:21.000000000 +0200
@@ -0,0 +1,12 @@
+/* fix sg_dma_len in ia64 being in pci.h instead of scatterlist.h */
+#ifndef BACKPORT_SCATTERLIST_H
+#define BACKPORT_SCATTERLIST_H
+
+#include_next <asm/scatterlist.h>
+
+#ifdef __ia64__
+#define sg_dma_address(sg)     ((sg)->dma_address)
+#define sg_dma_len(sg)         ((sg)->dma_length)
+#endif
+
+#endif
diff -urN a/kernel_addons/backport/2.6.16/include/asm/scatterlist.h b/kernel_addons/backport/2.6.16/include/asm/scatterlist.h
--- a/kernel_addons/backport/2.6.16/include/asm/scatterlist.h	1970-01-01 02:00:00.000000000 +0200
+++ b/kernel_addons/backport/2.6.16/include/asm/scatterlist.h	2006-12-26 16:07:21.000000000 +0200
@@ -0,0 +1,12 @@
+/* fix sg_dma_len in ia64 being in pci.h instead of scatterlist.h */
+#ifndef BACKPORT_SCATTERLIST_H
+#define BACKPORT_SCATTERLIST_H
+
+#include_next <asm/scatterlist.h>
+
+#ifdef __ia64__
+#define sg_dma_address(sg)     ((sg)->dma_address)
+#define sg_dma_len(sg)         ((sg)->dma_length)
+#endif
+
+#endif
diff -urN a/kernel_addons/backport/2.6.16_sles10/include/asm/scatterlist.h b/kernel_addons/backport/2.6.16_sles10/include/asm/scatterlist.h
--- a/kernel_addons/backport/2.6.16_sles10/include/asm/scatterlist.h	1970-01-01 02:00:00.000000000 +0200
+++ b/kernel_addons/backport/2.6.16_sles10/include/asm/scatterlist.h	2006-12-26 16:07:21.000000000 +0200
@@ -0,0 +1,12 @@
+/* fix sg_dma_len in ia64 being in pci.h instead of scatterlist.h */
+#ifndef BACKPORT_SCATTERLIST_H
+#define BACKPORT_SCATTERLIST_H
+
+#include_next <asm/scatterlist.h>
+
+#ifdef __ia64__
+#define sg_dma_address(sg)     ((sg)->dma_address)
+#define sg_dma_len(sg)         ((sg)->dma_length)
+#endif
+
+#endif
diff -urN a/kernel_addons/backport/2.6.17/include/asm/scatterlist.h b/kernel_addons/backport/2.6.17/include/asm/scatterlist.h
--- a/kernel_addons/backport/2.6.17/include/asm/scatterlist.h	1970-01-01 02:00:00.000000000 +0200
+++ b/kernel_addons/backport/2.6.17/include/asm/scatterlist.h	2006-12-26 16:07:21.000000000 +0200
@@ -0,0 +1,12 @@
+/* fix sg_dma_len in ia64 being in pci.h instead of scatterlist.h */
+#ifndef BACKPORT_SCATTERLIST_H
+#define BACKPORT_SCATTERLIST_H
+
+#include_next <asm/scatterlist.h>
+
+#ifdef __ia64__
+#define sg_dma_address(sg)     ((sg)->dma_address)
+#define sg_dma_len(sg)         ((sg)->dma_length)
+#endif
+
+#endif
diff -urN a/kernel_addons/backport/2.6.18/include/asm/scatterlist.h b/kernel_addons/backport/2.6.18/include/asm/scatterlist.h
--- a/kernel_addons/backport/2.6.18/include/asm/scatterlist.h	1970-01-01 02:00:00.000000000 +0200
+++ b/kernel_addons/backport/2.6.18/include/asm/scatterlist.h	2006-12-26 16:07:21.000000000 +0200
@@ -0,0 +1,12 @@
+/* fix sg_dma_len in ia64 being in pci.h instead of scatterlist.h */
+#ifndef BACKPORT_SCATTERLIST_H
+#define BACKPORT_SCATTERLIST_H
+
+#include_next <asm/scatterlist.h>
+
+#ifdef __ia64__
+#define sg_dma_address(sg)     ((sg)->dma_address)
+#define sg_dma_len(sg)         ((sg)->dma_length)
+#endif
+
+#endif
diff -urN a/kernel_addons/backport/2.6.18_FC6/include/asm/scatterlist.h b/kernel_addons/backport/2.6.18_FC6/include/asm/scatterlist.h
--- a/kernel_addons/backport/2.6.18_FC6/include/asm/scatterlist.h	1970-01-01 02:00:00.000000000 +0200
+++ b/kernel_addons/backport/2.6.18_FC6/include/asm/scatterlist.h	2006-12-26 16:07:21.000000000 +0200
@@ -0,0 +1,12 @@
+/* fix sg_dma_len in ia64 being in pci.h instead of scatterlist.h */
+#ifndef BACKPORT_SCATTERLIST_H
+#define BACKPORT_SCATTERLIST_H
+
+#include_next <asm/scatterlist.h>
+
+#ifdef __ia64__
+#define sg_dma_address(sg)     ((sg)->dma_address)
+#define sg_dma_len(sg)         ((sg)->dma_length)
+#endif
+
+#endif
diff -urN a/kernel_addons/backport/2.6.19/include/asm/scatterlist.h b/kernel_addons/backport/2.6.19/include/asm/scatterlist.h
--- a/kernel_addons/backport/2.6.19/include/asm/scatterlist.h	1970-01-01 02:00:00.000000000 +0200
+++ b/kernel_addons/backport/2.6.19/include/asm/scatterlist.h	2006-12-26 16:07:21.000000000 +0200
@@ -0,0 +1,12 @@
+/* fix sg_dma_len in ia64 being in pci.h instead of scatterlist.h */
+#ifndef BACKPORT_SCATTERLIST_H
+#define BACKPORT_SCATTERLIST_H
+
+#include_next <asm/scatterlist.h>
+
+#ifdef __ia64__
+#define sg_dma_address(sg)     ((sg)->dma_address)
+#define sg_dma_len(sg)         ((sg)->dma_length)
+#endif
+
+#endif
diff -urN a/kernel_addons/backport/2.6.5-7.244/include/asm/scatterlist.h b/kernel_addons/backport/2.6.5-7.244/include/asm/scatterlist.h
--- a/kernel_addons/backport/2.6.5-7.244/include/asm/scatterlist.h	1970-01-01 02:00:00.000000000 +0200
+++ b/kernel_addons/backport/2.6.5-7.244/include/asm/scatterlist.h	2006-12-26 16:07:21.000000000 +0200
@@ -0,0 +1,12 @@
+/* fix sg_dma_len in ia64 being in pci.h instead of scatterlist.h */
+#ifndef BACKPORT_SCATTERLIST_H
+#define BACKPORT_SCATTERLIST_H
+
+#include_next <asm/scatterlist.h>
+
+#ifdef __ia64__
+#define sg_dma_address(sg)     ((sg)->dma_address)
+#define sg_dma_len(sg)         ((sg)->dma_length)
+#endif
+
+#endif
diff -urN a/kernel_addons/backport/2.6.9_U2/include/asm/scatterlist.h b/kernel_addons/backport/2.6.9_U2/include/asm/scatterlist.h
--- a/kernel_addons/backport/2.6.9_U2/include/asm/scatterlist.h	1970-01-01 02:00:00.000000000 +0200
+++ b/kernel_addons/backport/2.6.9_U2/include/asm/scatterlist.h	2006-12-26 16:07:21.000000000 +0200
@@ -0,0 +1,12 @@
+/* fix sg_dma_len in ia64 being in pci.h instead of scatterlist.h */
+#ifndef BACKPORT_SCATTERLIST_H
+#define BACKPORT_SCATTERLIST_H
+
+#include_next <asm/scatterlist.h>
+
+#ifdef __ia64__
+#define sg_dma_address(sg)     ((sg)->dma_address)
+#define sg_dma_len(sg)         ((sg)->dma_length)
+#endif
+
+#endif
diff -urN a/kernel_addons/backport/2.6.9_U3/include/asm/scatterlist.h b/kernel_addons/backport/2.6.9_U3/include/asm/scatterlist.h
--- a/kernel_addons/backport/2.6.9_U3/include/asm/scatterlist.h	1970-01-01 02:00:00.000000000 +0200
+++ b/kernel_addons/backport/2.6.9_U3/include/asm/scatterlist.h	2006-12-26 16:07:21.000000000 +0200
@@ -0,0 +1,12 @@
+/* fix sg_dma_len in ia64 being in pci.h instead of scatterlist.h */
+#ifndef BACKPORT_SCATTERLIST_H
+#define BACKPORT_SCATTERLIST_H
+
+#include_next <asm/scatterlist.h>
+
+#ifdef __ia64__
+#define sg_dma_address(sg)     ((sg)->dma_address)
+#define sg_dma_len(sg)         ((sg)->dma_length)
+#endif
+
+#endif
diff -urN a/kernel_addons/backport/2.6.9_U4/include/asm/scatterlist.h b/kernel_addons/backport/2.6.9_U4/include/asm/scatterlist.h
--- a/kernel_addons/backport/2.6.9_U4/include/asm/scatterlist.h	1970-01-01 02:00:00.000000000 +0200
+++ b/kernel_addons/backport/2.6.9_U4/include/asm/scatterlist.h	2006-12-26 16:07:21.000000000 +0200
@@ -0,0 +1,12 @@
+/* fix sg_dma_len in ia64 being in pci.h instead of scatterlist.h */
+#ifndef BACKPORT_SCATTERLIST_H
+#define BACKPORT_SCATTERLIST_H
+
+#include_next <asm/scatterlist.h>
+
+#ifdef __ia64__
+#define sg_dma_address(sg)     ((sg)->dma_address)
+#define sg_dma_len(sg)         ((sg)->dma_length)
+#endif
+
+#endif
--
Yosef Etigin
yosefe at voltaire.com