Commit 92c0103b authored by James Bottomley's avatar James Bottomley Committed by Linus Torvalds

[PATCH] move sg_dma_ macros out of asm-i386/pci.h

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.
parent 87746b70
......@@ -82,14 +82,6 @@ pci_dac_dma_sync_single(struct pci_dev *pdev, dma64_addr_t dma_addr, size_t len,
flush_write_buffers();
}
/* 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 HAVE_PCI_MMAP
extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
enum pci_mmap_state mmap_state, int write_combine);
......
......@@ -8,6 +8,14 @@ struct scatterlist {
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) */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment