diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-03 21:01:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-03 21:01:04 -0800 |
| commit | f3ed88a6bce69942b44fa7927a92cd52011881d7 (patch) | |
| tree | 98e58b314bcb0097294a81ef31306579cea752e1 /include | |
| parent | ce1928da8440eb5f73c20c5c88a449a4d59209d0 (diff) | |
| parent | dda02fd6278d9e995850b3c1dba484f17cbe4de4 (diff) | |
| download | linux-f3ed88a6bce69942b44fa7927a92cd52011881d7.tar.gz linux-f3ed88a6bce69942b44fa7927a92cd52011881d7.tar.bz2 linux-f3ed88a6bce69942b44fa7927a92cd52011881d7.zip | |
Merge branch 'fixes-for-v3.18' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
Pull CMA and DMA-mapping fixes from Marek Szyprowski:
"This contains important fixes for recently introduced highmem support
for default contiguous memory region used for dma-mapping subsystem"
* 'fixes-for-v3.18' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
mm, cma: make parameters order consistent in func declaration and definition
mm: cma: Use %pa to print physical addresses
mm: cma: Ensure that reservations never cross the low/high mem boundary
mm: cma: Always consider a 0 base address reservation as dynamic
mm: cma: Don't crash on allocation if CMA area can't be activated
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cma.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/cma.h b/include/linux/cma.h index 0430ed05d3b9..a93438beb33c 100644 --- a/include/linux/cma.h +++ b/include/linux/cma.h @@ -18,12 +18,12 @@ struct cma; extern phys_addr_t cma_get_base(struct cma *cma); extern unsigned long cma_get_size(struct cma *cma); -extern int __init cma_declare_contiguous(phys_addr_t size, - phys_addr_t base, phys_addr_t limit, +extern int __init cma_declare_contiguous(phys_addr_t base, + phys_addr_t size, phys_addr_t limit, phys_addr_t alignment, unsigned int order_per_bit, bool fixed, struct cma **res_cma); -extern int cma_init_reserved_mem(phys_addr_t size, - phys_addr_t base, int order_per_bit, +extern int cma_init_reserved_mem(phys_addr_t base, + phys_addr_t size, int order_per_bit, struct cma **res_cma); extern struct page *cma_alloc(struct cma *cma, int count, unsigned int align); extern bool cma_release(struct cma *cma, struct page *pages, int count); |