From 75c46162be3d0025d448e0b738d6f8b51ff8a6e5 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Tue, 31 Jul 2007 13:11:25 +0900 Subject: sh64: Kill off virt_to_bus()/bus_to_virt(). Follows the SH change. Signed-off-by: Paul Mundt --- arch/sh64/Kconfig | 3 +++ arch/sh64/kernel/pci-dma.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'arch/sh64') diff --git a/arch/sh64/Kconfig b/arch/sh64/Kconfig index ff654204b7d..5664631d8ae 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 a36c3d71a3f..a9328f89475 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); -- cgit v1.2.3-70-g09d2