|
@@ -1127,17 +1127,15 @@ static void __init __gic_init_bases(unsigned int gic_nr, int irq_start,
|
|
gic_pm_init(gic);
|
|
gic_pm_init(gic);
|
|
}
|
|
}
|
|
|
|
|
|
-void __init gic_init_bases(unsigned int gic_nr, int irq_start,
|
|
|
|
- void __iomem *dist_base, void __iomem *cpu_base,
|
|
|
|
- u32 percpu_offset, struct device_node *node)
|
|
|
|
|
|
+void __init gic_init(unsigned int gic_nr, int irq_start,
|
|
|
|
+ void __iomem *dist_base, void __iomem *cpu_base)
|
|
{
|
|
{
|
|
/*
|
|
/*
|
|
* Non-DT/ACPI systems won't run a hypervisor, so let's not
|
|
* Non-DT/ACPI systems won't run a hypervisor, so let's not
|
|
* bother with these...
|
|
* bother with these...
|
|
*/
|
|
*/
|
|
static_key_slow_dec(&supports_deactivate);
|
|
static_key_slow_dec(&supports_deactivate);
|
|
- __gic_init_bases(gic_nr, irq_start, dist_base, cpu_base,
|
|
|
|
- percpu_offset, node);
|
|
|
|
|
|
+ __gic_init_bases(gic_nr, irq_start, dist_base, cpu_base, 0, NULL);
|
|
}
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_OF
|
|
#ifdef CONFIG_OF
|