1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c
index 0792d930c48..7a64aa9b51b 100644
--- a/drivers/infiniband/hw/ehca/ehca_irq.c
+++ b/drivers/infiniband/hw/ehca/ehca_irq.c
@@ -646,8 +646,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);