Skip to content

Commit 82b60a8

Browse files
KAGA-KOKOvijay-suman
authored andcommitted
irqchip/gic-v2m: Mark a few functions __init
[ Upstream commit d51a15a ] They are all part of the init sequence. Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: Marc Zyngier <[email protected]> Link: https://lore.kernel.org/r/[email protected] Stable-dep-of: 3318dc299b07 ("irqchip/gic-v2m: Prevent use after free of gicv2m_get_fwnode()") Signed-off-by: Sasha Levin <[email protected]> (cherry picked from commit 073b77f8619f3f808ae3410ebe9ff54d6f19e578) Signed-off-by: Vijayendra Suman <[email protected]>
1 parent 08917df commit 82b60a8

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/irqchip/irq-gic-v2m.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ static struct msi_domain_info gicv2m_pmsi_domain_info = {
262262
.chip = &gicv2m_pmsi_irq_chip,
263263
};
264264

265-
static void gicv2m_teardown(void)
265+
static void __init gicv2m_teardown(void)
266266
{
267267
struct v2m_data *v2m, *tmp;
268268

@@ -277,7 +277,7 @@ static void gicv2m_teardown(void)
277277
}
278278
}
279279

280-
static int gicv2m_allocate_domains(struct irq_domain *parent)
280+
static __init int gicv2m_allocate_domains(struct irq_domain *parent)
281281
{
282282
struct irq_domain *inner_domain, *pci_domain, *plat_domain;
283283
struct v2m_data *v2m;
@@ -404,7 +404,7 @@ static int __init gicv2m_init_one(struct fwnode_handle *fwnode,
404404
return ret;
405405
}
406406

407-
static const struct of_device_id gicv2m_device_id[] = {
407+
static __initconst struct of_device_id gicv2m_device_id[] = {
408408
{ .compatible = "arm,gic-v2m-frame", },
409409
{},
410410
};
@@ -454,7 +454,7 @@ static int __init gicv2m_of_init(struct fwnode_handle *parent_handle,
454454
#ifdef CONFIG_ACPI
455455
static int acpi_num_msi;
456456

457-
static struct fwnode_handle *gicv2m_get_fwnode(struct device *dev)
457+
static __init struct fwnode_handle *gicv2m_get_fwnode(struct device *dev)
458458
{
459459
struct v2m_data *data;
460460

@@ -469,7 +469,7 @@ static struct fwnode_handle *gicv2m_get_fwnode(struct device *dev)
469469
return data->fwnode;
470470
}
471471

472-
static bool acpi_check_amazon_graviton_quirks(void)
472+
static __init bool acpi_check_amazon_graviton_quirks(void)
473473
{
474474
static struct acpi_table_madt *madt;
475475
acpi_status status;

0 commit comments

Comments
 (0)