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

Commit 91fb2788 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 2fdabe5f 3340eeb6

arch/arm/mm/dma-mapping.c

+2 −2
Original line number Diff line number Diff line
@@ -1276,8 +1276,8 @@ static struct page **__iommu_alloc_buffer(struct device *dev, size_t size, 
					  int coherent_flag)

{

	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;

	int order_idx = 0;

arch/arm64/mm/dma-mapping.c

+4 −4
Original line number Diff line number Diff line
@@ -1179,8 +1179,8 @@ static struct page **__iommu_alloc_buffer(struct device *dev, size_t size, 
					  gfp_t gfp, unsigned long 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)
@@ -1370,8 +1370,8 @@ static void *__iommu_alloc_atomic(struct device *dev, size_t size, 
{

	struct page *page;

	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;

	void *addr;