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

Commit 05061354 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

powerpc: Fix bug in iommu_alloc_coherent causing hang during boot 



In commit 8eb6c6e3, Christoph Hellwig
made iommu_alloc_coherent able to do node-local allocations, but
unfortunately got the order of the arguments to alloc_pages_node
wrong.  This fixes it.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 6b81e800

arch/powerpc/kernel/iommu.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -561,7 +561,7 @@ void *iommu_alloc_coherent(struct iommu_table *tbl, size_t size, 
		return NULL;

		return NULL;





	/* Alloc enough pages (and possibly more) */

	/* Alloc enough pages (and possibly more) */

	page = alloc_pages_node(flag, order, node);

	page = alloc_pages_node(node, flag, order);

	if (!page)

	if (!page)

		return NULL;

		return NULL;

	ret = page_address(page);

	ret = page_address(page);