diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-26 06:39:46 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-26 06:39:46 +0900 |
| commit | 0bbc367e21bfeea33230d893be4fa3a3ff9bcb48 (patch) | |
| tree | 50fb335648a22ac519eddb772714ba64a3e6a7ec /include/linux/cma.h | |
| parent | ae416ba4e94a30486ba2af0afe052579e7114ab8 (diff) | |
| parent | 32b88194f71d6ae7768a29f87fbba454728273ee (diff) | |
Merge 4.3-rc7 into usb-next
We want the USB and other fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/cma.h')
| -rw-r--r-- | include/linux/cma.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cma.h b/include/linux/cma.h index f7ef093ec49a..29f9e774ab76 100644 --- a/include/linux/cma.h +++ b/include/linux/cma.h @@ -26,6 +26,6 @@ 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, unsigned int count, unsigned int align); +extern struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align); extern bool cma_release(struct cma *cma, const struct page *pages, unsigned int count); #endif |