diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-04-19 13:19:56 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-19 13:19:56 -0400 |
commit | 2be621498d461b63ca6124f86e3b9582e1a8e722 (patch) | |
tree | 5b2e3af9ca287c7742f59f909cbce0e7bca3f333 /arch/x86/kernel/pci-swiotlb_64.c | |
parent | 4d92fbf231fe23ec07d18820a141c573a7f5017a (diff) |
x86: dma-ops on highmem fix
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/pci-swiotlb_64.c')
-rw-r--r-- | arch/x86/kernel/pci-swiotlb_64.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/x86/kernel/pci-swiotlb_64.c b/arch/x86/kernel/pci-swiotlb_64.c index 82a0a674a003..490da7f4b8d0 100644 --- a/arch/x86/kernel/pci-swiotlb_64.c +++ b/arch/x86/kernel/pci-swiotlb_64.c | |||
@@ -11,11 +11,18 @@ | |||
11 | 11 | ||
12 | int swiotlb __read_mostly; | 12 | int swiotlb __read_mostly; |
13 | 13 | ||
14 | static dma_addr_t | ||
15 | swiotlb_map_single_phys(struct device *hwdev, phys_addr_t paddr, size_t size, | ||
16 | int direction) | ||
17 | { | ||
18 | return swiotlb_map_single(hwdev, phys_to_virt(paddr), size, direction); | ||
19 | } | ||
20 | |||
14 | const struct dma_mapping_ops swiotlb_dma_ops = { | 21 | const struct dma_mapping_ops swiotlb_dma_ops = { |
15 | .mapping_error = swiotlb_dma_mapping_error, | 22 | .mapping_error = swiotlb_dma_mapping_error, |
16 | .alloc_coherent = swiotlb_alloc_coherent, | 23 | .alloc_coherent = swiotlb_alloc_coherent, |
17 | .free_coherent = swiotlb_free_coherent, | 24 | .free_coherent = swiotlb_free_coherent, |
18 | .map_single = swiotlb_map_single, | 25 | .map_single = swiotlb_map_single_phys, |
19 | .unmap_single = swiotlb_unmap_single, | 26 | .unmap_single = swiotlb_unmap_single, |
20 | .sync_single_for_cpu = swiotlb_sync_single_for_cpu, | 27 | .sync_single_for_cpu = swiotlb_sync_single_for_cpu, |
21 | .sync_single_for_device = swiotlb_sync_single_for_device, | 28 | .sync_single_for_device = swiotlb_sync_single_for_device, |