summaryrefslogtreecommitdiffstats
path: root/arch/sh64
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-07-31 13:11:25 +0900
committerPaul Mundt <lethal@linux-sh.org>2007-07-31 13:11:25 +0900
commit75c46162be3d0025d448e0b738d6f8b51ff8a6e5 (patch)
treea27c712bf4457aef48d6b918aad606148544cbb3 /arch/sh64
parentda9d5108f43d63f09b0328a4211f5f404ea05ab0 (diff)
downloadop-kernel-dev-75c46162be3d0025d448e0b738d6f8b51ff8a6e5.zip
op-kernel-dev-75c46162be3d0025d448e0b738d6f8b51ff8a6e5.tar.gz
sh64: Kill off virt_to_bus()/bus_to_virt().
Follows the SH change. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh64')
-rw-r--r--arch/sh64/Kconfig3
-rw-r--r--arch/sh64/kernel/pci-dma.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/sh64/Kconfig b/arch/sh64/Kconfig
index ff65420..5664631 100644
--- a/arch/sh64/Kconfig
+++ b/arch/sh64/Kconfig
@@ -47,6 +47,9 @@ config ARCH_HAS_ILOG2_U64
bool
default n
+config ARCH_NO_VIRT_TO_BUS
+ def_bool y
+
source init/Kconfig
menu "System type"
diff --git a/arch/sh64/kernel/pci-dma.c b/arch/sh64/kernel/pci-dma.c
index a36c3d7..a9328f8 100644
--- a/arch/sh64/kernel/pci-dma.c
+++ b/arch/sh64/kernel/pci-dma.c
@@ -30,7 +30,7 @@ void *consistent_alloc(struct pci_dev *hwdev, size_t size,
if (vp != NULL) {
memset(vp, 0, size);
- *dma_handle = virt_to_bus(ret);
+ *dma_handle = virt_to_phys(ret);
dma_cache_wback_inv((unsigned long)ret, size);
}
@@ -42,7 +42,7 @@ void consistent_free(struct pci_dev *hwdev, size_t size,
{
void *alloc;
- alloc = bus_to_virt((unsigned long)dma_handle);
+ alloc = phys_to_virt((unsigned long)dma_handle);
free_pages((unsigned long)alloc, get_order(size));
iounmap(vaddr);
OpenPOWER on IntegriCloud