]> err.no Git - linux-2.6/commitdiff
powerpc: Fix bug in iommu_alloc_coherent causing hang during boot
authorPaul Mackerras <paulus@samba.org>
Sat, 10 Jun 2006 08:17:35 +0000 (18:17 +1000)
committerPaul Mackerras <paulus@samba.org>
Sat, 10 Jun 2006 08:17:35 +0000 (18:17 +1000)
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 <paulus@samba.org>
arch/powerpc/kernel/iommu.c

index cbb794556d023e1a4f5172eece21cd9966d99a4f..cef8cba8329b1fb2f8eb691a34e3539b06bc226b 100644 (file)
@@ -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);