---

yaml --- r: 5143 b: refs/heads/master c: 9f6a3d0 h: refs/heads/master i: 5141: 21bf690 5139: 7f46685 5135: 4c1c901 v: v3
git-mirror · Jul 27, 2005 · d648a68 · d648a68
1 parent 49d7d9c
commit d648a68
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: 15ce2982c6bc41ccd7f2cbca63e024aa9044c000
+refs/heads/master: 9f6a3d083729c76ced92106c259f0e6536a2eaea
diff --git a/trunk/include/asm-ppc/dma-mapping.h b/trunk/include/asm-ppc/dma-mapping.h
@@ -117,7 +117,7 @@ dma_map_page(struct device *dev, struct page *page,
 
 	__dma_sync_page(page, offset, size, direction);
 
-	return (page - mem_map) * PAGE_SIZE + PCI_DRAM_OFFSET + offset;
+	return page_to_bus(page) + offset;
 }
 
 /* We do nothing. */