---

yaml --- r: 11669 b: refs/heads/master c: 89edce0 h: refs/heads/master i: 11667: 304f721 v: v3
git-mirror · Oct 27, 2005 · 6d36287 · 6d36287
1 parent c101580
commit 6d36287
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 30 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8168f902fa9c2ca8930ea8d72cce283234df03b8
+refs/heads/master: 89edce0b4e71f6f78e27d7c18c63e957469b74d3
diff --git a/trunk/include/asm-ppc64/scatterlist.h → trunk/include/asm-powerpc/scatterlist.h b/trunk/include/asm-ppc64/scatterlist.h → trunk/include/asm-powerpc/scatterlist.h
@@ -1,6 +1,5 @@
-#ifndef _PPC64_SCATTERLIST_H
-#define _PPC64_SCATTERLIST_H
-
+#ifndef _ASM_POWERPC_SCATTERLIST_H
+#define _ASM_POWERPC_SCATTERLIST_H
 /*
  * Copyright (C) 2001 PPC64 Team, IBM Corp
  *
@@ -10,6 +9,7 @@
  * 2 of the License, or (at your option) any later version.
  */
 
+#ifdef __KERNEL__
 #include <linux/types.h>
 #include <asm/dma.h>
 
@@ -23,9 +23,23 @@ struct scatterlist {
 	u32 dma_length;
 };
 
+/*
+ * These macros should be used after a dma_map_sg call has been done
+ * to get bus addresses of each of the SG entries and their lengths.
+ * You should only work with the number of sg entries pci_map_sg
+ * returns, or alternatively stop on the first sg_dma_len(sg) which
+ * is 0.
+ */
 #define sg_dma_address(sg)	((sg)->dma_address)
+#ifdef __powerpc64__
 #define sg_dma_len(sg)		((sg)->dma_length)
+#else
+#define sg_dma_len(sg)		((sg)->length)
+#endif
 
+#ifdef __powerpc64__
 #define ISA_DMA_THRESHOLD	(~0UL)
+#endif
 
-#endif /* !(_PPC64_SCATTERLIST_H) */
+#endif /* __KERNEL__ */
+#endif /* _ASM_POWERPC_SCATTERLIST_H */
diff --git a/trunk/include/asm-ppc/scatterlist.h b/trunk/include/asm-ppc/scatterlist.h