|| ||James Bottomley <James.Bottomley@steeleye.com>|
|| ||[PATCH] move sg_dma_ macros out of asm-i386/pci.h|
|| ||29 Jun 2003 23:07:11 -0500|
|| ||Linux Kernel <firstname.lastname@example.org>|
These macros belong in asm-i386/scatterlist.h instead.
As the headers are disentangled this has shown up as a problem with my
MCA SCSI drivers since they no-longer include asm/pci.h in any form but
need to traverse the scatterlist.
===== include/asm-i386/pci.h 1.22 vs edited =====
--- 1.22/include/asm-i386/pci.h Mon Jun 9 11:25:58 2003
+++ edited/include/asm-i386/pci.h Sun Jun 29 21:18:53 2003
@@ -82,14 +82,6 @@
-/* These macros should be used after a pci_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.
-#define sg_dma_address(sg) ((sg)->dma_address)
-#define sg_dma_len(sg) ((sg)->length)
extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
enum pci_mmap_state mmap_state, int write_combine);
===== include/asm-i386/scatterlist.h 1.3 vs edited =====
--- 1.3/include/asm-i386/scatterlist.h Wed Feb 6 07:32:52 2002
+++ edited/include/asm-i386/scatterlist.h Sun Jun 29 21:18:54 2003
@@ -8,6 +8,14 @@
unsigned int length;
+/* These macros should be used after a pci_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.
+#define sg_dma_address(sg) ((sg)->dma_address)
+#define sg_dma_len(sg) ((sg)->length)
#define ISA_DMA_THRESHOLD (0x00ffffff)
#endif /* !(_I386_SCATTERLIST_H) */