diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2021-08-10 11:01:42 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2021-08-10 11:01:42 +0200 |
| commit | 4b41ea606e535d47636ac4f5283834e9f6c5fa53 (patch) | |
| tree | 3aca6a13a01782c5ee2de1bb1c9b14d93e95433a /kernel/irq | |
| parent | genirq: Improve "hwirq" output in /proc and /sys/ (diff) | |
| parent | x86/msi: Force affinity setup before startup (diff) | |
| download | linux-4b41ea606e535d47636ac4f5283834e9f6c5fa53.tar.xz linux-4b41ea606e535d47636ac4f5283834e9f6c5fa53.zip | |
Merge branch 'irq/urgent' into irq/core
to pick up fixes on which further changes depend on.
Diffstat (limited to 'kernel/irq')
| -rw-r--r-- | kernel/irq/chip.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 7f04c7d8296e..a98bcfc4be7b 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -265,8 +265,11 @@ int irq_startup(struct irq_desc *desc, bool resend, bool force) } else { switch (__irq_startup_managed(desc, aff, force)) { case IRQ_STARTUP_NORMAL: + if (d->chip->flags & IRQCHIP_AFFINITY_PRE_STARTUP) + irq_setup_affinity(desc); ret = __irq_startup(desc); - irq_setup_affinity(desc); + if (!(d->chip->flags & IRQCHIP_AFFINITY_PRE_STARTUP)) + irq_setup_affinity(desc); break; case IRQ_STARTUP_MANAGED: irq_do_set_affinity(d, aff, false); |