Commit 21f7e8bb authored by Wei Li's avatar Wei Li Committed by Xie XiuQi
Browse files

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: default avatarWei Li <liwei391@huawei.com>
Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parent 91174684
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -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;