From 44e4c833c37342cd9a861eefe88e60ba33eea428 Mon Sep 17 00:00:00 2001 From: Mike Travis Date: Mon, 12 May 2008 21:21:13 +0200 Subject: [PATCH] --- yaml --- r: 105209 b: refs/heads/master c: 5d7bfd0c4d463d288422032c9903d0452dee141d h: refs/heads/master i: 105207: aafa100edcc76ab1304aeb09b55160d0ff8c47b1 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/ehca/ehca_irq.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2cf372b5ddc6..c285656c5f95 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 334ef7a7ab8f80b689a2be95d5e62d2167900865 +refs/heads/master: 5d7bfd0c4d463d288422032c9903d0452dee141d diff --git a/trunk/drivers/infiniband/hw/ehca/ehca_irq.c b/trunk/drivers/infiniband/hw/ehca/ehca_irq.c index ce1ab0571be3..43180b952c1f 100644 --- a/trunk/drivers/infiniband/hw/ehca/ehca_irq.c +++ b/trunk/drivers/infiniband/hw/ehca/ehca_irq.c @@ -641,8 +641,8 @@ static inline int find_next_online_cpu(struct ehca_comp_pool *pool) ehca_dmp(&cpu_online_map, sizeof(cpumask_t), ""); spin_lock_irqsave(&pool->last_cpu_lock, flags); - cpu = next_cpu(pool->last_cpu, cpu_online_map); - if (cpu == NR_CPUS) + cpu = next_cpu_nr(pool->last_cpu, cpu_online_map); + if (cpu >= nr_cpu_ids) cpu = first_cpu(cpu_online_map); pool->last_cpu = cpu; spin_unlock_irqrestore(&pool->last_cpu_lock, flags);