summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Porter <mporter@kernel.crashing.org>2005-07-27 20:44:12 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-28 01:25:56 +0200
commit9f6a3d083729c76ced92106c259f0e6536a2eaea (patch)
tree4b0b7722eecc19d0e61b5cabb7a1928293028617
parent[PATCH] ppc32: Fix building of radstone_ppc7d (diff)
downloadlinux-9f6a3d083729c76ced92106c259f0e6536a2eaea.tar.xz
linux-9f6a3d083729c76ced92106c259f0e6536a2eaea.zip
[PATCH] ppc32: fix dma_map_page() to use page_to_bus()
The following trivial patch changes dma_map_page() to use page_to_bus() instead of open-coding it (incorrectly in some cases). Signed-off-by: Eugene Surovegin <ebs@ebshome.net> Signed-off-by: Matt Porter <mporter@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/asm-ppc/dma-mapping.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ppc/dma-mapping.h b/include/asm-ppc/dma-mapping.h
index 7f0487afebbe..6f74f59938d4 100644
--- a/include/asm-ppc/dma-mapping.h
+++ b/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. */