x86: dma-ops on highmem fix

[deliverable/linux.git] / arch / x86 / kernel / pci-base_32.c

diff --git a/arch/x86/kernel/pci-base_32.c b/arch/x86/kernel/pci-base_32.c
index 033d94ec500031dda98178b79a904a767075a5e5..cf4bb28dfc6a6eb26016da1fbe2e5c938068ac55 100644 (file)
--- a/arch/x86/kernel/pci-base_32.c
+++ b/arch/x86/kernel/pci-base_32.c
@@ -4,12 +4,12 @@
 #include <linux/dma-mapping.h>
 #include <asm/dma-mapping.h>
 
-static dma_addr_t pci32_map_single(struct device *dev, void *ptr,
+static dma_addr_t pci32_map_single(struct device *dev, phys_addr_t ptr,
                                   size_t size, int direction)
 {
        WARN_ON(size == 0);
        flush_write_buffers();
-       return virt_to_phys(ptr);
+       return ptr;
 }
 
 static int pci32_dma_map_sg(struct device *dev, struct scatterlist *sglist,