diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-09 19:26:33 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-09 19:26:33 +0200 |
| commit | 64c353864e3f7ccba0ade1bd6f562f9a3bc7e68d (patch) | |
| tree | fdd4d4c0cc90ef920cd755b835f0acf1e6ef8fbf /include/asm-generic | |
| parent | Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | ARM: init: add support for reserved memory defined by device tree (diff) | |
| download | linux-64c353864e3f7ccba0ade1bd6f562f9a3bc7e68d.tar.xz linux-64c353864e3f7ccba0ade1bd6f562f9a3bc7e68d.zip | |
Merge branch 'for-v3.12' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
Pull DMA mapping update from Marek Szyprowski:
"This contains an addition of Device Tree support for reserved memory
regions (Contiguous Memory Allocator is one of the drivers for it) and
changes required by the KVM extensions for PowerPC architectue"
* 'for-v3.12' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
ARM: init: add support for reserved memory defined by device tree
drivers: of: add initialization code for dma reserved memory
drivers: of: add function to scan fdt nodes given by path
drivers: dma-contiguous: clean source code and prepare for device tree
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/dma-contiguous.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/include/asm-generic/dma-contiguous.h b/include/asm-generic/dma-contiguous.h deleted file mode 100644 index 294b1e755ab2..000000000000 --- a/include/asm-generic/dma-contiguous.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef ASM_DMA_CONTIGUOUS_H -#define ASM_DMA_CONTIGUOUS_H - -#ifdef __KERNEL__ -#ifdef CONFIG_CMA - -#include <linux/device.h> -#include <linux/dma-contiguous.h> - -static inline struct cma *dev_get_cma_area(struct device *dev) -{ - if (dev && dev->cma_area) - return dev->cma_area; - return dma_contiguous_default_area; -} - -static inline void dev_set_cma_area(struct device *dev, struct cma *cma) -{ - if (dev) - dev->cma_area = cma; - if (!dev && !dma_contiguous_default_area) - dma_contiguous_default_area = cma; -} - -#endif -#endif - -#endif |