diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-06-10 18:17:35 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-06-10 18:17:35 +1000 |
| commit | 050613545b389825c1f5beb67fa2667b727f866d (patch) | |
| tree | d1d06c033d5254052dcc4824c1051a9966727c5b /arch/powerpc/kernel/iommu.c | |
| parent | 6b81e80049a8815dc457fec4dadb6ae535c3b988 (diff) | |
| download | blackbird-op-linux-050613545b389825c1f5beb67fa2667b727f866d.tar.gz blackbird-op-linux-050613545b389825c1f5beb67fa2667b727f866d.zip | |
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 <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/iommu.c')
| -rw-r--r-- | arch/powerpc/kernel/iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |
