From: Glauber Costa Date: Tue, 8 Apr 2008 16:20:48 +0000 (-0300) Subject: x86: use dma_length in i386 X-Git-Tag: v2.6.26-rc1~1133^2~22 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d741bde26dc3444eaeb269051d3f0b623b24de13;p=linux-2.6-omap-h63xx.git x86: use dma_length in i386 This is done to get the code closer to x86_64. Signed-off-by: Glauber Costa Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/kernel/pci-base_32.c b/arch/x86/kernel/pci-base_32.c index 7caf5c211f2..837bbe91043 100644 --- a/arch/x86/kernel/pci-base_32.c +++ b/arch/x86/kernel/pci-base_32.c @@ -24,6 +24,7 @@ static int pci32_dma_map_sg(struct device *dev, struct scatterlist *sglist, BUG_ON(!sg_page(sg)); sg->dma_address = sg_phys(sg); + sg->dma_length = sg->length; } flush_write_buffers(); diff --git a/include/asm-x86/scatterlist.h b/include/asm-x86/scatterlist.h index d13c197866d..c0432061f81 100644 --- a/include/asm-x86/scatterlist.h +++ b/include/asm-x86/scatterlist.h @@ -11,9 +11,7 @@ struct scatterlist { unsigned int offset; unsigned int length; dma_addr_t dma_address; -#ifdef CONFIG_X86_64 unsigned int dma_length; -#endif }; #define ARCH_HAS_SG_CHAIN