---

yaml --- r: 91021 b: refs/heads/master c: d741bde h: refs/heads/master i: 91019: b4f83ad v: v3
git-mirror · Apr 19, 2008 · 64f70c2 · 64f70c2
1 parent 0a4c3ec
commit 64f70c2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b3e5b7273435f8a7f83d3556a09adfd6f247e36
+refs/heads/master: d741bde26dc3444eaeb269051d3f0b623b24de13
diff --git a/trunk/arch/x86/kernel/pci-base_32.c b/trunk/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/trunk/include/asm-x86/scatterlist.h b/trunk/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