diff options
| author | Marek Szyprowski | 2011-12-29 13:09:51 +0100 |
|---|---|---|
| committer | Marek Szyprowski | 2012-05-21 15:09:38 +0200 |
| commit | 0a2b9a6ea93650b8a00f9fd5ee8fdd25671e2df6 (patch) | |
| tree | c930063ff30882db67e110774bf8b46497d23f15 /arch/x86/kernel/pci-nommu.c | |
| parent | drivers: add Contiguous Memory Allocator (diff) | |
| download | kernel-qcow2-linux-0a2b9a6ea93650b8a00f9fd5ee8fdd25671e2df6.tar.gz kernel-qcow2-linux-0a2b9a6ea93650b8a00f9fd5ee8fdd25671e2df6.tar.xz kernel-qcow2-linux-0a2b9a6ea93650b8a00f9fd5ee8fdd25671e2df6.zip | |
X86: integrate CMA with DMA-mapping subsystem
This patch adds support for CMA to dma-mapping subsystem for x86
architecture that uses common pci-dma/pci-nommu implementation. This
allows to test CMA on KVM/QEMU and a lot of common x86 boxes.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
CC: Michal Nazarewicz <mina86@mina86.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/x86/kernel/pci-nommu.c')
| -rw-r--r-- | arch/x86/kernel/pci-nommu.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/x86/kernel/pci-nommu.c b/arch/x86/kernel/pci-nommu.c index f96050685b46..871be4a84c7d 100644 --- a/arch/x86/kernel/pci-nommu.c +++ b/arch/x86/kernel/pci-nommu.c @@ -74,12 +74,6 @@ static int nommu_map_sg(struct device *hwdev, struct scatterlist *sg, return nents; } -static void nommu_free_coherent(struct device *dev, size_t size, void *vaddr, - dma_addr_t dma_addr, struct dma_attrs *attrs) -{ - free_pages((unsigned long)vaddr, get_order(size)); -} - static void nommu_sync_single_for_device(struct device *dev, dma_addr_t addr, size_t size, enum dma_data_direction dir) @@ -97,7 +91,7 @@ static void nommu_sync_sg_for_device(struct device *dev, struct dma_map_ops nommu_dma_ops = { .alloc = dma_generic_alloc_coherent, - .free = nommu_free_coherent, + .free = dma_generic_free_coherent, .map_sg = nommu_map_sg, .map_page = nommu_map_page, .sync_single_for_device = nommu_sync_single_for_device, |