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-calgary_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-calgary_64.c')
-rw-r--r-- | arch/x86/kernel/pci-calgary_64.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c index 1b5464c2434..adb91e4b62d 100644 --- a/arch/x86/kernel/pci-calgary_64.c +++ b/arch/x86/kernel/pci-calgary_64.c | |||
@@ -470,10 +470,11 @@ error: | |||
470 | return 0; | 470 | return 0; |
471 | } | 471 | } |
472 | 472 | ||
473 | static dma_addr_t calgary_map_single(struct device *dev, void *vaddr, | 473 | static dma_addr_t calgary_map_single(struct device *dev, phys_addr_t paddr, |
474 | size_t size, int direction) | 474 | size_t size, int direction) |
475 | { | 475 | { |
476 | dma_addr_t dma_handle = bad_dma_address; | 476 | dma_addr_t dma_handle = bad_dma_address; |
477 | void *vaddr = phys_to_virt(paddr); | ||
477 | unsigned long uaddr; | 478 | unsigned long uaddr; |
478 | unsigned int npages; | 479 | unsigned int npages; |
479 | struct iommu_table *tbl = find_iommu_table(dev); | 480 | struct iommu_table *tbl = find_iommu_table(dev); |