diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-07-31 00:11:25 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-07-31 00:11:25 -0400 |
commit | 75c46162be3d0025d448e0b738d6f8b51ff8a6e5 (patch) | |
tree | a27c712bf4457aef48d6b918aad606148544cbb3 /arch | |
parent | da9d5108f43d63f09b0328a4211f5f404ea05ab0 (diff) |
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')
-rw-r--r-- | arch/sh64/Kconfig | 3 | ||||
-rw-r--r-- | arch/sh64/kernel/pci-dma.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/sh64/Kconfig b/arch/sh64/Kconfig index ff654204b7d4..5664631d8ae5 100644 --- a/arch/sh64/Kconfig +++ b/arch/sh64/Kconfig | |||
@@ -47,6 +47,9 @@ config ARCH_HAS_ILOG2_U64 | |||
47 | bool | 47 | bool |
48 | default n | 48 | default n |
49 | 49 | ||
50 | config ARCH_NO_VIRT_TO_BUS | ||
51 | def_bool y | ||
52 | |||
50 | source init/Kconfig | 53 | source init/Kconfig |
51 | 54 | ||
52 | menu "System type" | 55 | menu "System type" |
diff --git a/arch/sh64/kernel/pci-dma.c b/arch/sh64/kernel/pci-dma.c index a36c3d71a3fe..a9328f894755 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, | |||
30 | 30 | ||
31 | if (vp != NULL) { | 31 | if (vp != NULL) { |
32 | memset(vp, 0, size); | 32 | memset(vp, 0, size); |
33 | *dma_handle = virt_to_bus(ret); | 33 | *dma_handle = virt_to_phys(ret); |
34 | dma_cache_wback_inv((unsigned long)ret, size); | 34 | dma_cache_wback_inv((unsigned long)ret, size); |
35 | } | 35 | } |
36 | 36 | ||
@@ -42,7 +42,7 @@ void consistent_free(struct pci_dev *hwdev, size_t size, | |||
42 | { | 42 | { |
43 | void *alloc; | 43 | void *alloc; |
44 | 44 | ||
45 | alloc = bus_to_virt((unsigned long)dma_handle); | 45 | alloc = phys_to_virt((unsigned long)dma_handle); |
46 | free_pages((unsigned long)alloc, get_order(size)); | 46 | free_pages((unsigned long)alloc, get_order(size)); |
47 | 47 | ||
48 | iounmap(vaddr); | 48 | iounmap(vaddr); |