diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 11:27:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 11:27:10 -0800 |
| commit | c45564e91604ca4d03505ba4d567541c7e4f86fe (patch) | |
| tree | f686dce956b8ceef91215aff55009555875b394c /include | |
| parent | 93874681aa3f538a2b9d59a6c5b7c0e882a36978 (diff) | |
| parent | 4009793e15d44469da1547a46ab129cc08ffa503 (diff) | |
| download | linux-stable-c45564e91604ca4d03505ba4d567541c7e4f86fe.tar.gz linux-stable-c45564e91604ca4d03505ba4d567541c7e4f86fe.tar.bz2 linux-stable-c45564e91604ca4d03505ba4d567541c7e4f86fe.zip | |
Merge branch 'for-v3.8' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
Pull CMA and DMA-mapping update from Marek Szyprowski:
"Another set of Contiguous Memory Allocator and DMA-mapping framework
updates for v3.8.
This pull request consists only of two patches. The first fixes a
long standing issue with dmapools (the code predates current GIT
history), which forced all allocations to use GFP_ATOMIC flag,
ignoring the flags passed by the caller. The second patch changes CMA
code to correctly use phys_addr_t type what enables support for LPAE
systems."
* 'for-v3.8' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
drivers: cma: represent physical addresses as phys_addr_t
mm: dmapool: use provided gfp flags for all dma_alloc_coherent() calls
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dma-contiguous.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/dma-contiguous.h b/include/linux/dma-contiguous.h index 2f303e4b7ed3..01b5c84be828 100644 --- a/include/linux/dma-contiguous.h +++ b/include/linux/dma-contiguous.h @@ -68,7 +68,7 @@ struct device; extern struct cma *dma_contiguous_default_area; void dma_contiguous_reserve(phys_addr_t addr_limit); -int dma_declare_contiguous(struct device *dev, unsigned long size, +int dma_declare_contiguous(struct device *dev, phys_addr_t size, phys_addr_t base, phys_addr_t limit); struct page *dma_alloc_from_contiguous(struct device *dev, int count, @@ -83,7 +83,7 @@ bool dma_release_from_contiguous(struct device *dev, struct page *pages, static inline void dma_contiguous_reserve(phys_addr_t limit) { } static inline -int dma_declare_contiguous(struct device *dev, unsigned long size, +int dma_declare_contiguous(struct device *dev, phys_addr_t size, phys_addr_t base, phys_addr_t limit) { return -ENOSYS; |