ANDROID: GKI: irq-gic-v3: fix up breakage in 6.1.35 merge

In commit 0cdb593c2f ("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: 0cdb593c2f ("irqchip/gic-v3: Disable pseudo NMIs on Mediatek devices w/ firmware issues")
Change-Id: I8fbf8c8f862a3d249e37fbabf9ae7078b3332245
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-06-23 12:13:21 +00:00
parent 1e4b07ffa3
commit 1118d7f559

View File

@ -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;