Re: linux-next: build failure after merge of the tip tree

From: Paul E. McKenney
Date: Thu Aug 16 2012 - 15:47:16 EST


On Thu, Aug 16, 2012 at 01:12:36PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the tip tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> drivers/infiniband/hw/ehca/ehca_irq.c: In function 'find_next_online_cpu':
> drivers/infiniband/hw/ehca/ehca_irq.c:672:2: error: expected ';' before 'spin_unlock_irqrestore'
>
> Caused by commit 81942621bd6b ("infiniband: Ehca: Use hotplug thread
> infrastructure").
>
> I have used the tip tree from next-20120814 for today.

My first reaction was "we tested that!!!", but I see the conversion
from while(1) to do-while. Does the following cure it?

Thanx, Paul

------------------------------------------------------------------------

infiniband: ehca: Fix while->do-while conversion typo

This commit just adds a needed semicolon.

Signed-off-by: Paul E. McKenney <paul.mckenney@xxxxxxxxxx>
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>

diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c
index 4eeac40..83a0095 100644
--- a/drivers/infiniband/hw/ehca/ehca_irq.c
+++ b/drivers/infiniband/hw/ehca/ehca_irq.c
@@ -668,7 +668,7 @@ static int find_next_online_cpu(struct ehca_comp_pool *pool)
if (cpu >= nr_cpu_ids)
cpu = cpumask_first(cpu_online_mask);
pool->last_cpu = cpu;
- } while (!per_cpu_ptr(pool->cpu_comp_tasks, cpu)->active)
+ } while (!per_cpu_ptr(pool->cpu_comp_tasks, cpu)->active);
spin_unlock_irqrestore(&pool->last_cpu_lock, flags);

return cpu;

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/