diff --git a/[refs] b/[refs]
index 643ffdc62a37..f565c712c238 100644
--- 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
index 7caf5c211f23..837bbe91043e 100644
--- 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
index d13c197866d6..c0432061f81a 100644
--- 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