[POWERPC] node local IOMMU tables

Allocate IOMMU tables local to the relevant node.

Signed-off-by: Anton Blanchard <anton@samba.org>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 5 insertions, 4 deletions

diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c
index cef8cba8329b..7cb77c20fc5d 100644
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -418,10 +418,11 @@ void iommu_unmap_sg(struct iommu_table *tbl, struct scatterlist *sglist,
  * Build a iommu_table structure.  This contains a bit map which
  * is used to manage allocation of the tce space.
  */
-struct iommu_table *iommu_init_table(struct iommu_table *tbl)
+struct iommu_table *iommu_init_table(struct iommu_table *tbl, int nid)
 {
         unsigned long sz;
         static int welcomed = 0;
+        struct page *page;
 
         /* Set aside 1/4 of the table for large allocations. */
         tbl->it_halfpoint = tbl->it_size * 3 / 4;
@@ -429,10 +430,10 @@ struct iommu_table *iommu_init_table(struct iommu_table *tbl)
         /* number of bytes needed for the bitmap */
         sz = (tbl->it_size + 7) >> 3;
 
-        tbl->it_map = (unsigned long *)__get_free_pages(GFP_ATOMIC, get_order(sz));
-        if (!tbl->it_map)
+        page = alloc_pages_node(nid, GFP_ATOMIC, get_order(sz));
+        if (!page)
                 panic("iommu_init_table: Can't allocate %ld bytes\n", sz);
-
+        tbl->it_map = page_address(page);
         memset(tbl->it_map, 0, sz);
 
         tbl->it_hint = 0;