|
@@ -2,10 +2,10 @@
|
|
|
#define _ASM_I386_DMA_MAPPING_H
|
|
|
|
|
|
#include <linux/mm.h>
|
|
|
+#include <linux/scatterlist.h>
|
|
|
|
|
|
#include <asm/cache.h>
|
|
|
#include <asm/io.h>
|
|
|
-#include <asm/scatterlist.h>
|
|
|
#include <asm/bug.h>
|
|
|
|
|
|
#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
|
|
@@ -35,18 +35,19 @@ dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
|
|
|
}
|
|
|
|
|
|
static inline int
|
|
|
-dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
|
|
|
+dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
|
|
|
enum dma_data_direction direction)
|
|
|
{
|
|
|
+ struct scatterlist *sg;
|
|
|
int i;
|
|
|
|
|
|
BUG_ON(!valid_dma_direction(direction));
|
|
|
- WARN_ON(nents == 0 || sg[0].length == 0);
|
|
|
+ WARN_ON(nents == 0 || sglist[0].length == 0);
|
|
|
|
|
|
- for (i = 0; i < nents; i++ ) {
|
|
|
- BUG_ON(!sg[i].page);
|
|
|
+ for_each_sg(sglist, sg, nents, i) {
|
|
|
+ BUG_ON(!sg->page);
|
|
|
|
|
|
- sg[i].dma_address = page_to_phys(sg[i].page) + sg[i].offset;
|
|
|
+ sg->dma_address = page_to_phys(sg->page) + sg->offset;
|
|
|
}
|
|
|
|
|
|
flush_write_buffers();
|