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

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

Merge "arm/arm64: dma-mapping: Fix iova region size"

parents 5222e961 2d221c07

arch/arm/mm/dma-mapping.c

+1 −1
Original line number Diff line number Diff line
@@ -2078,7 +2078,7 @@ arm_iommu_create_mapping(struct bus_type *bus, dma_addr_t base, u64 size) 
	mapping->nr_bitmaps = 1;

	mapping->extensions = extensions;

	mapping->base = base;

	mapping->bits = BITS_PER_BYTE * bitmap_size;

	mapping->bits = bits;



	spin_lock_init(&mapping->lock);

arch/arm64/mm/dma-mapping.c

+1 −1
Original line number Diff line number Diff line
@@ -2064,7 +2064,7 @@ arm_iommu_create_mapping(struct bus_type *bus, dma_addr_t base, size_t size) 
		goto err2;



	mapping->base = base;

	mapping->bits = BITS_PER_BYTE * bitmap_size;

	mapping->bits = bits;

	spin_lock_init(&mapping->lock);



	mapping->domain = iommu_domain_alloc(bus);