Commit-ID:  2343877fbda701599653e63f8dcc318aa1bf15ee
Gitweb:     http://git.kernel.org/tip/2343877fbda701599653e63f8dcc318aa1bf15ee
Author:     Thomas Gleixner <t...@linutronix.de>
AuthorDate: Thu, 29 Jun 2017 23:33:39 +0200
Committer:  Thomas Gleixner <t...@linutronix.de>
CommitDate: Tue, 4 Jul 2017 12:46:16 +0200

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 <t...@linutronix.de>
Reviewed-by: Marc Zyngier <marc.zyng...@arm.com>
Cc: Daniel Lezcano <daniel.lezc...@linaro.org>
Cc: Heiko Stuebner <he...@sntech.de>
Cc: Julia Cartwright <ju...@ni.com>
Cc: Linus Walleij <linus.wall...@linaro.org>
Cc: Brian Norris <briannor...@chromium.org>
Cc: Doug Anderson <diand...@chromium.org>
Cc: linux-rockc...@lists.infradead.org
Cc: John Keeping <j...@metanate.com>
Cc: linux-g...@vger.kernel.org
Link: http://lkml.kernel.org/r/20170629214344.196130...@linutronix.de

---
 kernel/irq/manage.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 3e69343..91e1f23 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);
 

Reply via email to