2007-11-19 15:02:35

by FUJITA Tomonori

[permalink] [raw]
Subject: [PATCH] alpha: kill deprecated virt_to_bus

pci-noop.c doesn't use DMA mappings.

Signed-off-by: FUJITA Tomonori <[email protected]>
---
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 468b76c..8ac0831 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,
ret = (void *)__get_free_pages(gfp, get_order(size));
if (ret) {
memset(ret, 0, size);
- *dma_handle = virt_to_bus(ret);
+ *dma_handle = virt_to_phys(ret);
}
return ret;
}
@@ -184,7 +184,7 @@ dma_map_sg(struct device *dev, struct scatterlist *sgl, int nents,

BUG_ON(!sg_page(sg));
va = sg_virt(sg);
- sg_dma_address(sg) = (dma_addr_t)virt_to_bus(va);
+ sg_dma_address(sg) = (dma_addr_t)virt_to_phys(va);
sg_dma_len(sg) = sg->length;
}

--
1.5.3.4


2007-11-21 11:30:13

by Jens Axboe

[permalink] [raw]
Subject: Re: [PATCH] alpha: kill deprecated virt_to_bus

On Tue, Nov 20 2007, FUJITA Tomonori wrote:
> pci-noop.c doesn't use DMA mappings.

you should send that one to the alpha maintainers, it needs to go in
that way.

--
Jens Axboe

2007-11-22 02:49:38

by FUJITA Tomonori

[permalink] [raw]
Subject: Re: [PATCH] alpha: kill deprecated virt_to_bus

On Wed, 21 Nov 2007 12:26:55 +0100
Jens Axboe <[email protected]> wrote:

> On Tue, Nov 20 2007, FUJITA Tomonori wrote:
> > pci-noop.c doesn't use DMA mappings.
>
> you should send that one to the alpha maintainers, it needs to go in
> that way.

Yeah, I'll do.