[PATCH] ppc64: Fix thinko in iommu allocator

This fixes a bug in the iommu allocator that causes it to behave
strangely when a fair size of the table is allocated.

Thanks to Andrew Gallatin for finding this.

diff --git a/arch/ppc64/kernel/iommu.c b/arch/ppc64/kernel/iommu.c
index c34bbbc2455f6ddbebe709027fcfbe541f6523aa..a9097cac35de9ed7ae8cefed140c7aa281be1ab7 100644 (file)
--- a/arch/ppc64/kernel/iommu.c
+++ b/arch/ppc64/kernel/iommu.c
@@ -100,12 +100,13 @@ static unsigned long iommu_range_alloc(struct iommu_table *tbl, unsigned long np
        end = n + npages;
 
        if (unlikely(end >= limit)) {
-               if (likely(pass++ < 2)) {
+               if (likely(pass < 2)) {
                        /* First failure, just rescan the half of the table.
                         * Second failure, rescan the other half of the table.
                         */
                        start = (largealloc ^ pass) ? tbl->it_halfpoint : 0;
                        limit = pass ? tbl->it_mapsize : limit;
+                       pass++;
                        goto again;
                } else {
                        /* Third failure, give up */