---

yaml --- r: 45142 b: refs/heads/master c: dbc1333 h: refs/heads/master v: v3
git-mirror · Dec 30, 2006 · dcc5ccd · dcc5ccd
1 parent 73dd591
commit dcc5ccd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8018c27b26af56af18eb8b2dc600eba825792d8f
+refs/heads/master: dbc1333a347745bd55844649c19eb7d28f383a84
diff --git a/trunk/arch/sparc/kernel/ioport.c b/trunk/arch/sparc/kernel/ioport.c
@@ -726,7 +726,8 @@ int pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg, int nents,
 	/* IIep is write-through, not flushing. */
 	for (n = 0; n < nents; n++) {
 		BUG_ON(page_address(sg->page) == NULL);
-		sg->dvma_address = virt_to_phys(page_address(sg->page));
+		sg->dvma_address =
+			virt_to_phys(page_address(sg->page)) + sg->offset;
 		sg->dvma_length = sg->length;
 		sg++;
 	}