From: Ingo Molnar Date: Sat, 8 Jan 2022 09:53:57 +0000 (+0100) Subject: Merge branch 'linus' into irq/core, to fix conflict X-Git-Tag: v6.6.17~8413^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0422fe2666aea4c0986f4c89dc107731aa6a7a81;p=platform%2Fkernel%2Flinux-rpi.git Merge branch 'linus' into irq/core, to fix conflict Conflicts: drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c Signed-off-by: Ingo Molnar --- 0422fe2666aea4c0986f4c89dc107731aa6a7a81 diff --cc drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c index 54fb67cec544,bcee30f5de0a..fd7a671eda33 --- a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c @@@ -398,8 -398,8 +398,8 @@@ irq_pool_request_vector(struct mlx5_irq cpumask_copy(irq->mask, affinity); if (!irq_pool_is_sf_pool(pool) && !pool->xa_num_irqs.max && cpumask_empty(irq->mask)) - cpumask_set_cpu(0, irq->mask); + cpumask_set_cpu(cpumask_first(cpu_online_mask), irq->mask); - irq_set_affinity_hint(irq->irqn, irq->mask); + irq_set_affinity_and_hint(irq->irqn, irq->mask); unlock: mutex_unlock(&pool->lock); return irq;