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-base_32.c | |
| parent | 4d92fbf231fe23ec07d18820a141c573a7f5017a (diff) | |
| download | blackbird-op-linux-2be621498d461b63ca6124f86e3b9582e1a8e722.tar.gz blackbird-op-linux-2be621498d461b63ca6124f86e3b9582e1a8e722.zip | |
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-base_32.c')
| -rw-r--r-- | arch/x86/kernel/pci-base_32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/pci-base_32.c b/arch/x86/kernel/pci-base_32.c index 033d94ec5000..cf4bb28dfc6a 100644 --- 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, |
