diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-23 09:18:09 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-23 09:18:09 +0300 |
| commit | 064e6a8ba61a751625478f656c6f76a6f37a009e (patch) | |
| tree | a22d84d037543f74b6c86969c7e87ab799768de9 /kernel/irq/manage.c | |
| parent | af25ed59b5616b389d90877f7085dc5d457a3d49 (diff) | |
| parent | 23400ac997062647f2b63c82030d189671b1effe (diff) | |
| download | linux-064e6a8ba61a751625478f656c6f76a6f37a009e.tar.xz | |
Merge branch 'linus' into x86/fpu, to resolve conflicts
Conflicts:
arch/x86/kernel/fpu/core.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/irq/manage.c')
| -rw-r--r-- | kernel/irq/manage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 9c4d30483264..6b669593e7eb 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -1341,12 +1341,12 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) } else if (new->flags & IRQF_TRIGGER_MASK) { unsigned int nmsk = new->flags & IRQF_TRIGGER_MASK; - unsigned int omsk = irq_settings_get_trigger_mask(desc); + unsigned int omsk = irqd_get_trigger_type(&desc->irq_data); if (nmsk != omsk) /* hope the handler works with current trigger mode */ pr_warn("irq %d uses trigger mode %u; requested %u\n", - irq, nmsk, omsk); + irq, omsk, nmsk); } *old_ptr = new; |