diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-07-15 14:34:34 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-07-15 14:34:34 -0700 |
| commit | 0b99b1787ee281ada10b87d030c28aa23c3698f7 (patch) | |
| tree | 9f6c6c5c83e54e232eab7187b78340cbac0f867c | |
| parent | b6102f3c1fb44188e866ae874416011a6f855f98 (diff) | |
| parent | 6030ad31ec3ec7c9bb7ec42c2febf7b02d540136 (diff) | |
Merge "irq-chip: gic-v3: Initialize mpm for GIC monitored interrupts"
| -rw-r--r-- | drivers/irqchip/irq-gic-v3.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index 6095bd2ccb58..022473473971 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -29,6 +29,7 @@ #include <linux/irqchip.h> #include <linux/irqchip/arm-gic-v3.h> #include <linux/syscore_ops.h> +#include <linux/irqchip/msm-mpm-irq.h> #include <asm/cputype.h> #include <asm/exception.h> @@ -1107,6 +1108,7 @@ static int __init gic_of_init(struct device_node *node, struct device_node *pare gic_dist_init(); gic_cpu_init(); gic_cpu_pm_init(); + of_mpm_init(); #ifdef CONFIG_ARM_GIC_PANIC_HANDLER atomic_notifier_chain_register(&panic_notifier_list, &gic_panic_blk); |