diff options
| author | Linus Torvalds | 2017-07-30 11:27:33 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2017-07-30 11:27:33 -0700 |
| commit | 06efc7df376659963ba4de26217ebdcdc2a6c09b (patch) | |
| tree | 3fc53f8863d3c04765f52f81209d072237e62f4a /include | |
| parent | 0a07b238e5f488b459b6113a62e06b6aab017f71 (diff) | |
| parent | 8397913303abc9333f376a518a8368fa22ca5e6e (diff) | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fix from Thomas Gleixner:
"Fix for a regression caused by the conversion of x86 to the generic
hotplug code.
Instead of doing a plain single line revert, this adds a pile of
comments so the semantics of the force argument are clear"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
genirq/cpuhotplug: Revert "Set force affinity flag on hotplug migration"
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/irq.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index 00db35b61e9e..d2d543794093 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -388,7 +388,12 @@ static inline irq_hw_number_t irqd_to_hwirq(struct irq_data *d) * @irq_mask_ack: ack and mask an interrupt source * @irq_unmask: unmask an interrupt source * @irq_eoi: end of interrupt - * @irq_set_affinity: set the CPU affinity on SMP machines + * @irq_set_affinity: Set the CPU affinity on SMP machines. If the force + * argument is true, it tells the driver to + * unconditionally apply the affinity setting. Sanity + * checks against the supplied affinity mask are not + * required. This is used for CPU hotplug where the + * target CPU is not yet set in the cpu_online_mask. * @irq_retrigger: resend an IRQ to the CPU * @irq_set_type: set the flow type (IRQ_TYPE_LEVEL/etc.) of an IRQ * @irq_set_wake: enable/disable power-management wake-on of an IRQ |