diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-03-28 10:56:32 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-03-28 10:58:28 +0100 |
| commit | cfa637cb20e96fe8cf44b867a7d7c34649cbf8eb (patch) | |
| tree | 52591d7b53600d5d39369525a356ccb81e22fcd9 /kernel/irq/manage.c | |
| parent | db779ef67ffeadbb44e9e818eb64dbe528e2f48f (diff) | |
| parent | 8c2ffd9174779014c3fe1f96d9dc3641d9175f00 (diff) | |
| download | blackbird-op-linux-cfa637cb20e96fe8cf44b867a7d7c34649cbf8eb.tar.gz blackbird-op-linux-cfa637cb20e96fe8cf44b867a7d7c34649cbf8eb.zip | |
Merge tag 'v5.1-rc2' into core/urgent, to resolve a conflict
Conflicts:
include/linux/kcore.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/irq/manage.c')
| -rw-r--r-- | kernel/irq/manage.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 9ec34a2a6638..1401afa0d58a 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -196,6 +196,7 @@ int irq_do_set_affinity(struct irq_data *data, const struct cpumask *mask, case IRQ_SET_MASK_OK: case IRQ_SET_MASK_OK_DONE: cpumask_copy(desc->irq_common_data.affinity, mask); + /* fall through */ case IRQ_SET_MASK_OK_NOCOPY: irq_validate_effective_affinity(data); irq_set_thread_affinity(desc); |
