summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/lib
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-10-09 17:06:24 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-10-14 10:35:26 +1100
commit8aa2659009714cf5f9ffe7f3e16ccfa8ff0e0d61 (patch)
tree070526522368d43ab8e0332a849474b44c80e980 /arch/powerpc/lib
parent1263965f298af611d4992165242202eb194db1c1 (diff)
downloadop-kernel-dev-8aa2659009714cf5f9ffe7f3e16ccfa8ff0e0d61.zip
op-kernel-dev-8aa2659009714cf5f9ffe7f3e16ccfa8ff0e0d61.tar.gz
powerpc: Fix DMA offset for non-coherent DMA
After Becky's work we can almost have different DMA offsets between on-chip devices and PCI. Almost because there's a problem with the non-coherent DMA code that basically ignores the programmed offset to use the global one for everything. This fixes it. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/lib')
-rw-r--r--arch/powerpc/lib/dma-noncoherent.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/lib/dma-noncoherent.c b/arch/powerpc/lib/dma-noncoherent.c
index 5d83907..31734c0 100644
--- a/arch/powerpc/lib/dma-noncoherent.c
+++ b/arch/powerpc/lib/dma-noncoherent.c
@@ -203,7 +203,7 @@ __dma_alloc_coherent(size_t size, dma_addr_t *handle, gfp_t gfp)
/*
* Set the "dma handle"
*/
- *handle = page_to_bus(page);
+ *handle = page_to_phys(page);
do {
BUG_ON(!pte_none(*pte));
OpenPOWER on IntegriCloud