diff --git a/[refs] b/[refs]
index a52cb452fa92..80621e88ad6f 100644
--- 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
index 7f0487afebbe..6f74f59938d4 100644
--- 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. */