---

yaml --- r: 313727 b: refs/heads/master c: dcd261b h: refs/heads/master i: 313725: b0c815b 313723: 87059ac 313719: b28f874 313711: 74b9629 313695: ab19acb 313663: 9853f91 313599: 33d50d7 v: v3
git-mirror · Jul 13, 2012 · c060158 · c060158
1 parent bde41e1
commit c060158
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;