diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-01-06 12:07:10 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-01-06 12:07:10 +0100 |
| commit | b6815f354518591400ce4c3a5fd63337643710ff (patch) | |
| tree | 14f8a117b4556f7dba5a5a9ccebc5e3b204cbd56 /drivers/mfd/arizona-irq.c | |
| parent | a0a8f2ada3f50f0190ebcbb60e77e697444c470e (diff) | |
| parent | 89876f275e8d562912d9c238cd888b52065cf25c (diff) | |
| download | talos-obmc-linux-b6815f354518591400ce4c3a5fd63337643710ff.tar.gz talos-obmc-linux-b6815f354518591400ce4c3a5fd63337643710ff.zip | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/mfd/arizona-irq.c')
| -rw-r--r-- | drivers/mfd/arizona-irq.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mfd/arizona-irq.c b/drivers/mfd/arizona-irq.c index 09cf3699e354..a307832d7e45 100644 --- a/drivers/mfd/arizona-irq.c +++ b/drivers/mfd/arizona-irq.c @@ -184,6 +184,7 @@ static struct irq_chip arizona_irq_chip = { }; static struct lock_class_key arizona_irq_lock_class; +static struct lock_class_key arizona_irq_request_class; static int arizona_irq_map(struct irq_domain *h, unsigned int virq, irq_hw_number_t hw) @@ -191,7 +192,8 @@ static int arizona_irq_map(struct irq_domain *h, unsigned int virq, struct arizona *data = h->host_data; irq_set_chip_data(virq, data); - irq_set_lockdep_class(virq, &arizona_irq_lock_class); + irq_set_lockdep_class(virq, &arizona_irq_lock_class, + &arizona_irq_request_class); irq_set_chip_and_handler(virq, &arizona_irq_chip, handle_simple_irq); irq_set_nested_thread(virq, 1); irq_set_noprobe(virq); |
