diff options
author | FUJITA Tomonori <tomof@acm.org> | 2008-02-05 01:30:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 12:44:21 -0500 |
commit | fd2e2633c208e111348c9f84fd7eeb9c844aca02 (patch) | |
tree | 68ce64d906cca7ba9f354b8b85b0eb2d5f32e44a | |
parent | 26a6e661b118b95422ccfcd10c9997db5967df58 (diff) |
alpha: kill deprecated virt_to_bus
pci-noop.c doesn't use DMA mappings.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/alpha/kernel/pci-noop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/kernel/pci-noop.c b/arch/alpha/kernel/pci-noop.c index 468b76ce66a1..8ac08311f5a5 100644 --- a/arch/alpha/kernel/pci-noop.c +++ b/arch/alpha/kernel/pci-noop.c | |||
@@ -165,7 +165,7 @@ dma_alloc_coherent(struct device *dev, size_t size, | |||
165 | ret = (void *)__get_free_pages(gfp, get_order(size)); | 165 | ret = (void *)__get_free_pages(gfp, get_order(size)); |
166 | if (ret) { | 166 | if (ret) { |
167 | memset(ret, 0, size); | 167 | memset(ret, 0, size); |
168 | *dma_handle = virt_to_bus(ret); | 168 | *dma_handle = virt_to_phys(ret); |
169 | } | 169 | } |
170 | return ret; | 170 | return ret; |
171 | } | 171 | } |
@@ -184,7 +184,7 @@ dma_map_sg(struct device *dev, struct scatterlist *sgl, int nents, | |||
184 | 184 | ||
185 | BUG_ON(!sg_page(sg)); | 185 | BUG_ON(!sg_page(sg)); |
186 | va = sg_virt(sg); | 186 | va = sg_virt(sg); |
187 | sg_dma_address(sg) = (dma_addr_t)virt_to_bus(va); | 187 | sg_dma_address(sg) = (dma_addr_t)virt_to_phys(va); |
188 | sg_dma_len(sg) = sg->length; | 188 | sg_dma_len(sg) = sg->length; |
189 | } | 189 | } |
190 | 190 | ||