diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-25 15:44:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-25 15:44:54 -0700 |
| commit | 7f1495745347bc2cb9cc4f50d0a889caeb71f1f1 (patch) | |
| tree | 2402b7e52fec57cdbf16d52e5fb467044589ec31 /arch/x86 | |
| parent | 2c7505570353af02e48c58ab4d109edd9bbbdd81 (diff) | |
| parent | 85cdffcde0b6b831a06422413300d0f5c0e608c3 (diff) | |
| download | linux-stable-7f1495745347bc2cb9cc4f50d0a889caeb71f1f1.tar.gz linux-stable-7f1495745347bc2cb9cc4f50d0a889caeb71f1f1.tar.bz2 linux-stable-7f1495745347bc2cb9cc4f50d0a889caeb71f1f1.zip | |
Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block
* 'sg' of git://git.kernel.dk/linux-2.6-block:
fix sg_phys to use dma_addr_t
ub: add sg_init_table for sense and read capacity commands
x86: pci-gart fix
blackfin: fix sg fallout
xtensa: dma-mapping.h is using linux/scatterlist.h functions, so include it
SG: audit of drivers that use blk_rq_map_sg()
arch/um/drivers/ubd_kern.c: fix a building error
SG: Change sg_set_page() to take length and offset argument
AVR32: Fix sg_page breakage
mmc: sg fallout
m68k: sg fallout
More SG build fixes
sg: add missing sg_init_table calls to zfcp
SG build fix
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/pci-gart_64.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c index c56e9ee64964..ae7e0161ce46 100644 --- a/arch/x86/kernel/pci-gart_64.c +++ b/arch/x86/kernel/pci-gart_64.c @@ -338,7 +338,6 @@ static int __dma_map_cont(struct scatterlist *start, int nelems, BUG_ON(s != start && s->offset); if (s == start) { - *sout = *s; sout->dma_address = iommu_bus_base; sout->dma_address += iommu_page*PAGE_SIZE + s->offset; sout->dma_length = s->length; @@ -365,7 +364,7 @@ static inline int dma_map_cont(struct scatterlist *start, int nelems, { if (!need) { BUG_ON(nelems != 1); - *sout = *start; + sout->dma_address = start->dma_address; sout->dma_length = start->length; return 0; } |