From b4f83ad8e656597da19d4a35b9e291e474fc1df4 Mon Sep 17 00:00:00 2001
From: Glauber Costa <gcosta@redhat.com>
Date: Tue, 8 Apr 2008 13:20:47 -0300
Subject: [PATCH] --- yaml --- r: 91019 b: refs/heads/master c:
 30db2cbf38d68f466fd34488f8312a151225c9ac h: refs/heads/master i:   91017:
 eaabd4d88f172aa5489d9f5b733a516a2f65f8ae   91015:
 57e11b570d8bf9f6e88db79380cf75be3e9bc3c2 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/x86/kernel/pci-nommu_64.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;