From c06015873fdd14a4ca323834c52b14795537ee36 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri, 13 Jul 2012 17:45:49 +1000
Subject: [PATCH] --- yaml --- r: 313727 b: refs/heads/master c:
 dcd261ba58d7a49f4624b34b3bd2d535f63643a2 h: refs/heads/master i:   313725:
 b0c815b100c5ac18ce7148dd3e454c2eb7ac8300   313723:
 87059ac4bb74e3b47bda5a18b10e5c80617e219e   313719:
 b28f874a2fb19eb516c42d1e6939bb523db09717   313711:
 74b962979a1586cf463f2fdb8e1474976a3ee9a9   313695:
 ab19acb8e77c2d420f1c90193d957a97af891951   313663:
 9853f9124c2c61196bfe1223164deb74e7b1e602   313599:
 33d50d78adaab6149de11463acdbc9c83d61eddb v: v3

---
 [refs]                            | 2 +-
 trunk/arch/powerpc/kernel/iommu.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2ff358b581e4..3f606906e33d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af3bf7fbe0148aadc8fedd6f5e5279cabef9ced5
+refs/heads/master: dcd261ba58d7a49f4624b34b3bd2d535f63643a2
diff --git a/trunk/arch/powerpc/kernel/iommu.c b/trunk/arch/powerpc/kernel/iommu.c
index fbefe729df32..ff5a6ce027b8 100644
--- a/trunk/arch/powerpc/kernel/iommu.c
+++ b/trunk/arch/powerpc/kernel/iommu.c
@@ -676,9 +676,9 @@ struct iommu_table *iommu_init_table(struct iommu_table *tbl, int nid)
 		tbl->nr_pools = 1;
 
 	/* We reserve the top 1/4 of the table for large allocations */
-	tbl->poolsize = (tbl->it_size * 3 / 4) / IOMMU_NR_POOLS;
+	tbl->poolsize = (tbl->it_size * 3 / 4) / tbl->nr_pools;
 
-	for (i = 0; i < IOMMU_NR_POOLS; i++) {
+	for (i = 0; i < tbl->nr_pools; i++) {
 		p = &tbl->pools[i];
 		spin_lock_init(&(p->lock));
 		p->start = tbl->poolsize * i;