diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2007-07-24 12:39:27 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2007-10-16 11:26:02 +0200 |
| commit | b922f53bd02f2017a3a47f29abaee18f91fb8fb4 (patch) | |
| tree | 8723272239aa8a88322783ca9278cc3f9765c28b | |
| parent | 8b87d9f48a2f0e44fac57aca344d407df39a9901 (diff) | |
| download | op-kernel-dev-b922f53bd02f2017a3a47f29abaee18f91fb8fb4.zip op-kernel-dev-b922f53bd02f2017a3a47f29abaee18f91fb8fb4.tar.gz | |
x86-64: update nommu to sg helpers
Acked-by: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| -rw-r--r-- | arch/x86/kernel/pci-nommu_64.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/pci-nommu_64.c b/arch/x86/kernel/pci-nommu_64.c index 2a34c6c..e85d436 100644 --- a/arch/x86/kernel/pci-nommu_64.c +++ b/arch/x86/kernel/pci-nommu_64.c @@ -5,6 +5,7 @@ #include <linux/pci.h> #include <linux/string.h> #include <linux/dma-mapping.h> +#include <linux/scatterlist.h> #include <asm/iommu.h> #include <asm/processor.h> @@ -57,10 +58,10 @@ static void nommu_unmap_single(struct device *dev, dma_addr_t addr,size_t size, static int nommu_map_sg(struct device *hwdev, struct scatterlist *sg, int nents, int direction) { + struct scatterlist *s; int i; - for (i = 0; i < nents; i++ ) { - struct scatterlist *s = &sg[i]; + for_each_sg(sg, s, nents, i) { BUG_ON(!s->page); s->dma_address = virt_to_bus(page_address(s->page) +s->offset); if (!check_addr("map_sg", hwdev, s->dma_address, s->length)) |
