From 1118d7f559ce61706f82d6dae0912eec10a717e3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 23 Jun 2023 12:13:21 +0000 Subject: [PATCH] ANDROID: GKI: irq-gic-v3: fix up breakage in 6.1.35 merge In commit 0cdb593c2fe9 ("irqchip/gic-v3: Disable pseudo NMIs on Mediatek devices w/ firmware issues"), a new function was added that checked on the flags structure. However due to the out-of-tree patches for the irq-gic-v3.c driver in the Android tree, that commit broke the build due to the data structure having been renamed in the out-of-tree changes. Fix this up to refer to the correct structure, fixing the build and the quirk detection that came in the commit. Fixes: 0cdb593c2fe9 ("irqchip/gic-v3: Disable pseudo NMIs on Mediatek devices w/ firmware issues") Change-Id: I8fbf8c8f862a3d249e37fbabf9ae7078b3332245 Signed-off-by: Greg Kroah-Hartman --- drivers/irqchip/irq-gic-v3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index 1a126558bc6c..7e981e00aae4 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -1721,7 +1721,7 @@ static bool gic_enable_quirk_msm8996(void *data) static bool gic_enable_quirk_mtk_gicr(void *data) { - struct gic_chip_data *d = data; + struct gic_chip_data_v3 *d = data; d->flags |= FLAGS_WORKAROUND_MTK_GICR_SAVE;