From: Paul Mackerras Date: Sat, 10 Jun 2006 08:17:35 +0000 (+1000) Subject: powerpc: Fix bug in iommu_alloc_coherent causing hang during boot X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=050613545b389825c1f5beb67fa2667b727f866d;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git powerpc: Fix bug in iommu_alloc_coherent causing hang during boot In commit 8eb6c6e3b9c8bfed3d75536ab142d7694627c2e5, 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: Paul Mackerras --- diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c index cbb794556d02..cef8cba8329b 100644 --- a/arch/powerpc/kernel/iommu.c +++ b/arch/powerpc/kernel/iommu.c @@ -561,7 +561,7 @@ void *iommu_alloc_coherent(struct iommu_table *tbl, size_t size, return NULL; /* Alloc enough pages (and possibly more) */ - page = alloc_pages_node(flag, order, node); + page = alloc_pages_node(node, flag, order); if (!page) return NULL; ret = page_address(page);