From mboxrd@z Thu Jan 1 00:00:00 1970 From: Glauber Costa Subject: [PATCH 06/28] x86: use dma_length in i386 Date: Tue, 8 Apr 2008 13:20:48 -0300 Message-ID: <12076717124023-git-send-email-gcosta@redhat.com> References: <12076716702129-git-send-email-gcosta@redhat.com> Cc: akpm@linux-foundation.org, glommer@gmail.com, mingo@elte.hu, tglx@linutronix.de, kvm-devel@lists.sourceforge.net, amit.shah@qumranet.com, avi@qumranet.com, Glauber Costa To: linux-kernel@vger.kernel.org Return-path: In-Reply-To: <12076716702129-git-send-email-gcosta@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: kvm.vger.kernel.org This is done to get the code closer to x86_64. Signed-off-by: Glauber Costa --- arch/x86/kernel/pci-base_32.c | 1 + include/asm-x86/scatterlist.h | 2 -- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/pci-base_32.c b/arch/x86/kernel/pci-base_32.c index 7caf5c2..837bbe9 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 d13c197..c043206 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 -- 1.5.0.6