From d22ba286203cc4e39eb933fc6c05225e0eefda25 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 24 Jun 2020 08:42:19 +0200 Subject: [PATCH] Revert "ANDROID: irqchip/gic-v3: rename gic_of_init to work around a ThinLTO+CFI bug" This reverts commit 23141e26893e8a5614ccecd2b2d5b78e31d99313 as the LTO feature causes merge issues with 5.8-rc1. So remove it for now and allow the developer to add the latest version of the patches later on. Cc: Sami Tolvanen Signed-off-by: Greg Kroah-Hartman Change-Id: I4c8d4a523ad46af98162a6f453d39f81eb70be34 --- drivers/irqchip/irq-gic-v3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index d3a576abb0b5..66abafa8ac5f 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -1804,7 +1804,7 @@ static void __init gic_of_setup_kvm_info(struct device_node *node) gic_set_kvm_info(&gic_v3_kvm_info); } -static int __init gicv3_of_init(struct device_node *node, struct device_node *parent) +static int __init gic_of_init(struct device_node *node, struct device_node *parent) { void __iomem *dist_base; struct redist_region *rdist_regs; @@ -1874,7 +1874,7 @@ out_unmap_dist: return err; } -IRQCHIP_DECLARE(gic_v3, "arm,gic-v3", gicv3_of_init); +IRQCHIP_DECLARE(gic_v3, "arm,gic-v3", gic_of_init); #ifdef CONFIG_ACPI static struct