From 21f7e8bbb1c5141c871557f3b0da428a50d4689b Mon Sep 17 00:00:00 2001 From: Wei Li Date: Thu, 4 Apr 2019 16:19:27 +0800 Subject: [PATCH] irqchip/gic-v3: revert f0e6010dc18b ("irqchip/gic-v3: fix system hang caused by ftrace") hulk inclusion category: bugfix bugzilla: 12844 CVE: NA ------------------------------------------------- Revert f0e6010dc18b ("irqchip/gic-v3: fix system hang caused by ftrace"), which is a walkaround before, to prepare for the formal fix. Signed-off-by: Wei Li Reviewed-by: Yang Yingliang Signed-off-by: Yang Yingliang --- drivers/irqchip/irq-gic-v3.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index a3e7981ee365..700a59a67bba 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -491,8 +491,7 @@ static inline void gic_handle_nmi(u32 irqnr, struct pt_regs *regs) gic_deactivate_unhandled(irqnr); } -static asmlinkage void __exception_irq_entry notrace -gic_handle_irq(struct pt_regs *regs) +static asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs) { u32 irqnr; -- GitLab