From dfd572c112aaf0141346cce739db2af32df8d482 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Thu, 22 Oct 2020 11:42:27 -0700 Subject: [PATCH] ANDROID: irqchip/gic-v3: fix bad merge resolution A line from commit b19f0cc3fe48 ("ANDROID: power: wakeup_reason: wake reason enhancements") got dropped. Fixes: eb87047f0823 ("Merge c457cc800e89 ("Merge tag 'irq-core-2020-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline") Bug: 120445600 Change-Id: I2ac07946b60adb42114d8322b44806dce0ffc407 Signed-off-by: Eric Biggers --- drivers/irqchip/irq-gic-v3.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index b0b92e6517f3..d59e1e0217f0 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -675,6 +675,7 @@ static asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs if (handle_domain_irq(gic_data.domain, irqnr, regs)) { WARN_ONCE(true, "Unexpected interrupt received!\n"); + log_abnormal_wakeup_reason("unexpected HW IRQ %u", irqnr); gic_deactivate_unhandled(irqnr); } }