diff options
Diffstat (limited to 'arch/powerpc/sysdev/mpic.c')
| -rw-r--r-- | arch/powerpc/sysdev/mpic.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index 21b956701596..0efc12d1a3d7 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c | |||
| @@ -1057,13 +1057,6 @@ struct mpic * __init mpic_alloc(struct device_node *node, | |||
| 1057 | memset(mpic, 0, sizeof(struct mpic)); | 1057 | memset(mpic, 0, sizeof(struct mpic)); |
| 1058 | mpic->name = name; | 1058 | mpic->name = name; |
| 1059 | 1059 | ||
| 1060 | mpic->irqhost = irq_alloc_host(node, IRQ_HOST_MAP_LINEAR, | ||
| 1061 | isu_size, &mpic_host_ops, | ||
| 1062 | flags & MPIC_LARGE_VECTORS ? 2048 : 256); | ||
| 1063 | if (mpic->irqhost == NULL) | ||
| 1064 | return NULL; | ||
| 1065 | |||
| 1066 | mpic->irqhost->host_data = mpic; | ||
| 1067 | mpic->hc_irq = mpic_irq_chip; | 1060 | mpic->hc_irq = mpic_irq_chip; |
| 1068 | mpic->hc_irq.typename = name; | 1061 | mpic->hc_irq.typename = name; |
| 1069 | if (flags & MPIC_PRIMARY) | 1062 | if (flags & MPIC_PRIMARY) |
| @@ -1213,6 +1206,15 @@ struct mpic * __init mpic_alloc(struct device_node *node, | |||
| 1213 | mpic->isu_shift = 1 + __ilog2(mpic->isu_size - 1); | 1206 | mpic->isu_shift = 1 + __ilog2(mpic->isu_size - 1); |
| 1214 | mpic->isu_mask = (1 << mpic->isu_shift) - 1; | 1207 | mpic->isu_mask = (1 << mpic->isu_shift) - 1; |
| 1215 | 1208 | ||
| 1209 | mpic->irqhost = irq_alloc_host(node, IRQ_HOST_MAP_LINEAR, | ||
| 1210 | isu_size ? isu_size : mpic->num_sources, | ||
| 1211 | &mpic_host_ops, | ||
| 1212 | flags & MPIC_LARGE_VECTORS ? 2048 : 256); | ||
| 1213 | if (mpic->irqhost == NULL) | ||
| 1214 | return NULL; | ||
| 1215 | |||
| 1216 | mpic->irqhost->host_data = mpic; | ||
| 1217 | |||
| 1216 | /* Display version */ | 1218 | /* Display version */ |
| 1217 | switch (greg_feature & MPIC_GREG_FEATURE_VERSION_MASK) { | 1219 | switch (greg_feature & MPIC_GREG_FEATURE_VERSION_MASK) { |
| 1218 | case 1: | 1220 | case 1: |
