diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-04-19 19:19:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-19 19:19:56 +0200 |
| commit | 2be621498d461b63ca6124f86e3b9582e1a8e722 (patch) | |
| tree | 5b2e3af9ca287c7742f59f909cbce0e7bca3f333 /arch/x86/kernel/pci-calgary_64.c | |
| parent | 4d92fbf231fe23ec07d18820a141c573a7f5017a (diff) | |
| download | op-kernel-dev-2be621498d461b63ca6124f86e3b9582e1a8e722.zip op-kernel-dev-2be621498d461b63ca6124f86e3b9582e1a8e722.tar.gz | |
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 1b5464c..adb91e4 100644 --- a/arch/x86/kernel/pci-calgary_64.c +++ b/arch/x86/kernel/pci-calgary_64.c @@ -470,10 +470,11 @@ error: return 0; } -static dma_addr_t calgary_map_single(struct device *dev, void *vaddr, +static dma_addr_t calgary_map_single(struct device *dev, phys_addr_t paddr, size_t size, int direction) { dma_addr_t dma_handle = bad_dma_address; + void *vaddr = phys_to_virt(paddr); unsigned long uaddr; unsigned int npages; struct iommu_table *tbl = find_iommu_table(dev); |
