aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/pci-nommu_64.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-04-19 13:19:56 -0400
committerIngo Molnar <mingo@elte.hu>2008-04-19 13:19:56 -0400
commit2be621498d461b63ca6124f86e3b9582e1a8e722 (patch)
tree5b2e3af9ca287c7742f59f909cbce0e7bca3f333 /arch/x86/kernel/pci-nommu_64.c
parent4d92fbf231fe23ec07d18820a141c573a7f5017a (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-nommu_64.c')
-rw-r--r--arch/x86/kernel/pci-nommu_64.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/pci-nommu_64.c b/arch/x86/kernel/pci-nommu_64.c
index ab08e1832228..6e330769d017 100644
--- a/arch/x86/kernel/pci-nommu_64.c
+++ b/arch/x86/kernel/pci-nommu_64.c
@@ -26,10 +26,10 @@ check_addr(char *name, struct device *hwdev, dma_addr_t bus, size_t size)
26} 26}
27 27
28static dma_addr_t 28static dma_addr_t
29nommu_map_single(struct device *hwdev, void *ptr, size_t size, 29nommu_map_single(struct device *hwdev, phys_addr_t paddr, size_t size,
30 int direction) 30 int direction)
31{ 31{
32 dma_addr_t bus = virt_to_bus(ptr); 32 dma_addr_t bus = paddr;
33 if (!check_addr("map_single", hwdev, bus, size)) 33 if (!check_addr("map_single", hwdev, bus, size))
34 return bad_dma_address; 34 return bad_dma_address;
35 return bus; 35 return bus;