From 308e38b90b3ca5a1dbcd5514e8caca45e1e3da14 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Sat, 10 Jun 2006 18:17:35 +1000 Subject: [PATCH] --- yaml --- r: 28746 b: refs/heads/master c: 050613545b389825c1f5beb67fa2667b727f866d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/iommu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 14bd2f13d813..010fe7ed33c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b81e80049a8815dc457fec4dadb6ae535c3b988 +refs/heads/master: 050613545b389825c1f5beb67fa2667b727f866d diff --git a/trunk/arch/powerpc/kernel/iommu.c b/trunk/arch/powerpc/kernel/iommu.c index cbb794556d02..cef8cba8329b 100644 --- a/trunk/arch/powerpc/kernel/iommu.c +++ b/trunk/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);