Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 306dcdc7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm: Fix incorrect type conversion for size during dma allocation"

parents db2760b2 1f8f9b56

drivers/base/dma-contiguous.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ int __init dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base, 
 * global one. Requires architecture specific dev_get_cma_area() helper

 * function.

 */

struct page *dma_alloc_from_contiguous(struct device *dev, int count,

struct page *dma_alloc_from_contiguous(struct device *dev, size_t count,

				       unsigned int align)

{

	if (align > CONFIG_CMA_ALIGNMENT)

include/linux/cma.h

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,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, int order_per_bit,

					struct cma **res_cma);

extern struct page *cma_alloc(struct cma *cma, 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, struct page *pages, int count);

#endif

include/linux/dma-contiguous.h

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static inline int dma_declare_contiguous(struct device *dev, phys_addr_t size, 
	return ret;

}



struct page *dma_alloc_from_contiguous(struct device *dev, int count,

struct page *dma_alloc_from_contiguous(struct device *dev, size_t count,

				       unsigned int order);

bool dma_release_from_contiguous(struct device *dev, struct page *pages,

				 int count);
@@ -144,7 +144,7 @@ int dma_declare_contiguous(struct device *dev, phys_addr_t size, 
}



static inline

struct page *dma_alloc_from_contiguous(struct device *dev, int count,

struct page *dma_alloc_from_contiguous(struct device *dev, size_t count,

				       unsigned int order)

{

	return NULL;

mm/cma.c

+2 −2
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ err: 
 * This function allocates part of contiguous memory on specific

 * contiguous memory area.

 */

struct page *cma_alloc(struct cma *cma, int count, unsigned int align)

struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align)

{

	unsigned long mask, pfn, start = 0;

	unsigned long bitmap_maxno, bitmap_no, bitmap_count;
@@ -348,7 +348,7 @@ struct page *cma_alloc(struct cma *cma, int count, unsigned int align) 
	if (!cma || !cma->count)

		return NULL;



	pr_debug("%s(cma %p, count %d, align %d)\n", __func__, (void *)cma,

	pr_debug("%s(cma %p, count %zu, align %d)\n", __func__, (void *)cma,

		 count, align);



	if (!count)