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

Commit eb6cf9f8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fix from Catalin Marinas:
 "Invalidate the caches before clearing the DMA buffer via the
  non-cacheable alias in the FORCE_CONTIGUOUS case"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: dma-mapping: Fix FORCE_CONTIGUOUS buffer clearing
parents 4645453c 3238c359

arch/arm64/mm/dma-mapping.c

+1 −1
Original line number Diff line number Diff line
@@ -429,9 +429,9 @@ static void *__iommu_alloc_attrs(struct device *dev, size_t size, 
						   prot,

						   __builtin_return_address(0));

		if (addr) {

			memset(addr, 0, size);

			if (!coherent)

				__dma_flush_area(page_to_virt(page), iosize);

			memset(addr, 0, size);

		} else {

			iommu_dma_unmap_page(dev, *handle, iosize, 0, attrs);

			dma_release_from_contiguous(dev, page,