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

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

Merge "arm: dma-mapping: fix data types to hold size_t"

parents 248b9f86 30b28b0e

arch/arm/mm/dma-mapping.c

+2 −2
Original line number Diff line number Diff line
@@ -1211,8 +1211,8 @@ static struct page **__iommu_alloc_buffer(struct device *dev, size_t size, 
					  gfp_t gfp, struct dma_attrs *attrs)

{

	struct page **pages;

	int count = size >> PAGE_SHIFT;

	int array_size = count * sizeof(struct page *);

	size_t count = size >> PAGE_SHIFT;

	size_t array_size = count * sizeof(struct page *);

	int i = 0;



	if (array_size <= PAGE_SIZE)

arch/arm64/mm/dma-mapping.c

+4 −4
Original line number Diff line number Diff line
@@ -681,8 +681,8 @@ static struct page **__iommu_alloc_buffer(struct device *dev, size_t size, 
					  gfp_t gfp, struct dma_attrs *attrs)

{

	struct page **pages;

	int count = size >> PAGE_SHIFT;

	int array_size = count * sizeof(struct page *);

	size_t count = size >> PAGE_SHIFT;

	size_t array_size = count * sizeof(struct page *);

	int i = 0;



	if (array_size <= PAGE_SIZE)
@@ -870,8 +870,8 @@ void *__iommu_alloc_atomic(struct device *dev, size_t size, 
			dma_addr_t *handle, gfp_t gfp, struct dma_attrs *attrs)

{

	struct page **pages;

	int count = size >> PAGE_SHIFT;

	int array_size = count * sizeof(struct page *);

	size_t count = size >> PAGE_SHIFT;

	size_t array_size = count * sizeof(struct page *);

	void *addr;



	if (array_size <= PAGE_SIZE)