diff --git a/[refs] b/[refs]
index 1b30140cd547..20635cdb941b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4dcdd6b4fa33efee94e89cccd75e871c570c510
+refs/heads/master: 30db2cbf38d68f466fd34488f8312a151225c9ac
diff --git a/trunk/arch/x86/kernel/pci-nommu_64.c b/trunk/arch/x86/kernel/pci-nommu_64.c
index 1da9cf9be3aa..c6901e751770 100644
--- a/trunk/arch/x86/kernel/pci-nommu_64.c
+++ b/trunk/arch/x86/kernel/pci-nommu_64.c
@@ -60,7 +60,7 @@ static int nommu_map_sg(struct device *hwdev, struct scatterlist *sg,
 
 	for_each_sg(sg, s, nents, i) {
 		BUG_ON(!sg_page(s));
-		s->dma_address = virt_to_bus(sg_virt(s));
+		s->dma_address = sg_phys(s);
 		if (!check_addr("map_sg", hwdev, s->dma_address, s->length))
 			return 0;
 		s->dma_length = s->length;