---

yaml --- r: 91019 b: refs/heads/master c: 30db2cb h: refs/heads/master i: 91017: eaabd4d 91015: 57e11b5 v: v3
git-mirror · Apr 19, 2008 · b4f83ad · b4f83ad
1 parent 168d8cc
commit b4f83ad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;