From 9bc026fdd28ce79535c92b527b30c9319b3cf494 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Sun, 12 Feb 2006 14:34:59 -0800 Subject: [PATCH] --- yaml --- r: 20239 b: refs/heads/master c: 0d541064e8f58858e11cd34d81b6e83617f6eb4a h: refs/heads/master i: 20237: fc6075e9ab728b2ce5c516adf0c5f6c7d775dc15 20235: 66e7ac2b0d0a14a03d5c8590cb1f68354f3dbb7a 20231: 3ff3d2c172a0b88ddf3f71e96b83bfe89231de1a 20223: 69c304238afb1bac00819a7a473bbf52cf7c20c7 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/pci-gart.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index dd181018f06e..eb5e0fd6021c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a65d17c9d27a85782cfe1bbc36c747ffa1f81814 +refs/heads/master: 0d541064e8f58858e11cd34d81b6e83617f6eb4a diff --git a/trunk/arch/x86_64/kernel/pci-gart.c b/trunk/arch/x86_64/kernel/pci-gart.c index 2fe23a6c361b..dd0718dc178b 100644 --- a/trunk/arch/x86_64/kernel/pci-gart.c +++ b/trunk/arch/x86_64/kernel/pci-gart.c @@ -310,7 +310,7 @@ void gart_unmap_sg(struct device *dev, struct scatterlist *sg, int nents, int di for (i = 0; i < nents; i++) { struct scatterlist *s = &sg[i]; - if (!s->dma_length || !s->length) + if (!s->dma_length) break; dma_unmap_single(dev, s->dma_address, s->dma_length, dir); } @@ -364,7 +364,6 @@ static int __dma_map_cont(struct scatterlist *sg, int start, int stopat, BUG_ON(i > start && s->offset); if (i == start) { - *sout = *s; sout->dma_address = iommu_bus_base; sout->dma_address += iommu_page*PAGE_SIZE + s->offset; sout->dma_length = s->length; @@ -379,7 +378,7 @@ static int __dma_map_cont(struct scatterlist *sg, int start, int stopat, SET_LEAK(iommu_page); addr += PAGE_SIZE; iommu_page++; - } + } } BUG_ON(iommu_page - iommu_start != pages); return 0; @@ -391,7 +390,6 @@ static inline int dma_map_cont(struct scatterlist *sg, int start, int stopat, { if (!need) { BUG_ON(stopat - start != 1); - *sout = sg[start]; sout->dma_length = sg[start].length; return 0; }