git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
powerpc: Update remaining dma_mapping_ops to use map/unmap_page
[safe/jmp/linux-2.6]
/
arch
/
powerpc
/
platforms
/
iseries
/
iommu.c
diff --git
a/arch/powerpc/platforms/iseries/iommu.c
b/arch/powerpc/platforms/iseries/iommu.c
index
bb464d1
..
bbe828f
100644
(file)
--- a/
arch/powerpc/platforms/iseries/iommu.c
+++ b/
arch/powerpc/platforms/iseries/iommu.c
@@
-215,14
+215,15
@@
EXPORT_SYMBOL_GPL(iseries_hv_free);
dma_addr_t iseries_hv_map(void *vaddr, size_t size,
enum dma_data_direction direction)
{
dma_addr_t iseries_hv_map(void *vaddr, size_t size,
enum dma_data_direction direction)
{
- return iommu_map_single(NULL, &vio_iommu_table, vaddr, size,
- DMA_32BIT_MASK, direction, NULL);
+ return iommu_map_page(NULL, &vio_iommu_table, virt_to_page(vaddr),
+ (unsigned long)vaddr % PAGE_SIZE, size,
+ DMA_32BIT_MASK, direction, NULL);
}
void iseries_hv_unmap(dma_addr_t dma_handle, size_t size,
enum dma_data_direction direction)
{
}
void iseries_hv_unmap(dma_addr_t dma_handle, size_t size,
enum dma_data_direction direction)
{
- iommu_unmap_
singl
e(&vio_iommu_table, dma_handle, size, direction, NULL);
+ iommu_unmap_
pag
e(&vio_iommu_table, dma_handle, size, direction, NULL);
}
void __init iommu_vio_init(void)
}
void __init iommu_vio_init(void)