diff options
author | Ingo Molnar <mingo@kernel.org> | 2020-11-07 13:18:49 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2020-11-07 13:18:49 +0100 |
commit | 0a986ea81e1aa8ac17e82cda53cc95158217956e (patch) | |
tree | a054b0ef413b7f327c04137c5768b2da6488511d /drivers/scsi/mpt3sas/mpt3sas_base.c | |
parent | kprobes: Replace rp->free_instance with freelist (diff) | |
parent | kprobes: Init kprobes in early_initcall (diff) | |
download | linux-dev-0a986ea81e1aa8ac17e82cda53cc95158217956e.tar.xz linux-dev-0a986ea81e1aa8ac17e82cda53cc95158217956e.zip |
Merge branch 'linus' into perf/kprobes
Merge recent kprobes updates into perf/kprobes that came from -mm.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/scsi/mpt3sas/mpt3sas_base.c')
-rw-r--r-- | drivers/scsi/mpt3sas/mpt3sas_base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c index 5730f32496b6..8062bd99add8 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -1733,7 +1733,7 @@ _base_irqpoll(struct irq_poll *irqpoll, int budget) reply_q = container_of(irqpoll, struct adapter_reply_queue, irqpoll); if (reply_q->irq_line_enable) { - disable_irq(reply_q->os_irq); + disable_irq_nosync(reply_q->os_irq); reply_q->irq_line_enable = false; } num_entries = _base_process_reply_queue(reply_q); |