aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <[email protected]>2017-06-29 23:33:39 +0200
committerThomas Gleixner <[email protected]>2017-07-04 12:46:16 +0200
commit2343877fbda701599653e63f8dcc318aa1bf15ee (patch)
treed7880af87c74ca66ecd49f2d933412894551db8a /kernel
parent46e48e257360f0845fe17089713cbad4db611e70 (diff)
genirq/timings: Move free timings out of spinlocked region
No point to do memory management from a interrupt disabled spin locked region. Signed-off-by: Thomas Gleixner <[email protected]> Reviewed-by: Marc Zyngier <[email protected]> Cc: Daniel Lezcano <[email protected]> Cc: Heiko Stuebner <[email protected]> Cc: Julia Cartwright <[email protected]> Cc: Linus Walleij <[email protected]> Cc: Brian Norris <[email protected]> Cc: Doug Anderson <[email protected]> Cc: [email protected] Cc: John Keeping <[email protected]> Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected]
Diffstat (limited to 'kernel')
-rw-r--r--kernel/irq/manage.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 3e693430bfe1..91e1f2390752 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -1489,7 +1489,6 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id)
if (!desc->action) {
irq_settings_clr_disable_unlazy(desc);
irq_shutdown(desc);
- irq_remove_timings(desc);
}
#ifdef CONFIG_SMP
@@ -1531,8 +1530,10 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id)
}
}
- if (!desc->action)
+ if (!desc->action) {
irq_release_resources(desc);
+ irq_remove_timings(desc);
+ }
mutex_unlock(&desc->request_mutex);