diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-11-10 09:16:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-10 09:16:27 +0100 |
| commit | 4ecd33d930591d41fe356160593a9076467b961c (patch) | |
| tree | b9051a334540bbce38db1b2b03cebb4cf1d51f73 /arch/mips/mm/dma-default.c | |
| parent | x86, NMI watchdog: disable NMIs on LVT0 in case NMI watchdog is not working (diff) | |
| parent | Linux 2.6.28-rc4 (diff) | |
| download | linux-dev-4ecd33d930591d41fe356160593a9076467b961c.tar.xz linux-dev-4ecd33d930591d41fe356160593a9076467b961c.zip | |
Merge commit 'v2.6.28-rc4' into x86/apic
Diffstat (limited to 'arch/mips/mm/dma-default.c')
| -rw-r--r-- | arch/mips/mm/dma-default.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c index 891312f8e5a6..5b98d0e731c2 100644 --- a/arch/mips/mm/dma-default.c +++ b/arch/mips/mm/dma-default.c @@ -324,7 +324,6 @@ void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems, if (cpu_is_noncoherent_r10000(dev)) __dma_sync((unsigned long)page_address(sg_page(sg)), sg->length, direction); - plat_unmap_dma_mem(sg->dma_address); } } @@ -342,7 +341,6 @@ void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nele if (!plat_device_is_coherent(dev)) __dma_sync((unsigned long)page_address(sg_page(sg)), sg->length, direction); - plat_unmap_dma_mem(sg->dma_address); } } |