diff options
Diffstat (limited to 'drivers/irqchip/irq-gic.c')
-rw-r--r-- | drivers/irqchip/irq-gic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 19ceaa60e0f4..ee7c50312066 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c | |||
@@ -414,7 +414,7 @@ static void __init gic_dist_init(struct gic_chip_data *gic) | |||
414 | writel_relaxed(1, base + GIC_DIST_CTRL); | 414 | writel_relaxed(1, base + GIC_DIST_CTRL); |
415 | } | 415 | } |
416 | 416 | ||
417 | static void __cpuinit gic_cpu_init(struct gic_chip_data *gic) | 417 | static void gic_cpu_init(struct gic_chip_data *gic) |
418 | { | 418 | { |
419 | void __iomem *dist_base = gic_data_dist_base(gic); | 419 | void __iomem *dist_base = gic_data_dist_base(gic); |
420 | void __iomem *base = gic_data_cpu_base(gic); | 420 | void __iomem *base = gic_data_cpu_base(gic); |
@@ -702,8 +702,8 @@ static int gic_irq_domain_xlate(struct irq_domain *d, | |||
702 | } | 702 | } |
703 | 703 | ||
704 | #ifdef CONFIG_SMP | 704 | #ifdef CONFIG_SMP |
705 | static int __cpuinit gic_secondary_init(struct notifier_block *nfb, | 705 | static int gic_secondary_init(struct notifier_block *nfb, unsigned long action, |
706 | unsigned long action, void *hcpu) | 706 | void *hcpu) |
707 | { | 707 | { |
708 | if (action == CPU_STARTING || action == CPU_STARTING_FROZEN) | 708 | if (action == CPU_STARTING || action == CPU_STARTING_FROZEN) |
709 | gic_cpu_init(&gic_data[0]); | 709 | gic_cpu_init(&gic_data[0]); |
@@ -714,7 +714,7 @@ static int __cpuinit gic_secondary_init(struct notifier_block *nfb, | |||
714 | * Notifier for enabling the GIC CPU interface. Set an arbitrarily high | 714 | * Notifier for enabling the GIC CPU interface. Set an arbitrarily high |
715 | * priority because the GIC needs to be up before the ARM generic timers. | 715 | * priority because the GIC needs to be up before the ARM generic timers. |
716 | */ | 716 | */ |
717 | static struct notifier_block __cpuinitdata gic_cpu_notifier = { | 717 | static struct notifier_block gic_cpu_notifier = { |
718 | .notifier_call = gic_secondary_init, | 718 | .notifier_call = gic_secondary_init, |
719 | .priority = 100, | 719 | .priority = 100, |
720 | }; | 720 | }; |