diff options
| author | Tony Lindgren <tony@atomide.com> | 2017-03-06 08:37:53 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2017-03-06 08:37:53 -0800 |
| commit | e24bce8fb4c26bd0d8eca74cbbee1ad049246be3 (patch) | |
| tree | c219c2ec183633aa15841fca5b055a09d2d0b980 /include/linux/cma.h | |
| parent | b92675d998a9fa37fe9e0e35053a95b4a23c158b (diff) | |
| parent | c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 (diff) | |
Merge tag 'v4.11-rc1' into omap-for-v4.11/fixes
Linux 4.11-rc1
Diffstat (limited to 'include/linux/cma.h')
| -rw-r--r-- | include/linux/cma.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/cma.h b/include/linux/cma.h index 6f0a91b37f68..03f32d0bd1d8 100644 --- a/include/linux/cma.h +++ b/include/linux/cma.h @@ -29,6 +29,7 @@ extern int __init cma_declare_contiguous(phys_addr_t base, extern int cma_init_reserved_mem(phys_addr_t base, phys_addr_t size, unsigned int order_per_bit, struct cma **res_cma); -extern struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align); +extern struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align, + gfp_t gfp_mask); extern bool cma_release(struct cma *cma, const struct page *pages, unsigned int count); #endif |