From d648a689282e05719e22c6059623e49f5bba1f5a Mon Sep 17 00:00:00 2001 From: Matt Porter Date: Wed, 27 Jul 2005 11:44:12 -0700 Subject: [PATCH] --- yaml --- r: 5143 b: refs/heads/master c: 9f6a3d083729c76ced92106c259f0e6536a2eaea h: refs/heads/master i: 5141: 21bf69096cf729adb8c08e23bc14396e9f092256 5139: 7f466853f82ccdb7363bae2d3b04dc82a18d4623 5135: 4c1c90118eef8564bf55498030e66c0b67df77c5 v: v3 --- [refs] | 2 +- trunk/include/asm-ppc/dma-mapping.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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. */