diff options
Diffstat (limited to 'arch/powerpc/sysdev/mpic.c')
| -rw-r--r-- | arch/powerpc/sysdev/mpic.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index 63ff89575cbb..7e469358895f 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c | |||
| @@ -540,7 +540,7 @@ static void mpic_end_ipi(unsigned int irq) | |||
| 540 | * IPIs are marked IRQ_PER_CPU. This has the side effect of | 540 | * IPIs are marked IRQ_PER_CPU. This has the side effect of |
| 541 | * preventing the IRQ_PENDING/IRQ_INPROGRESS logic from | 541 | * preventing the IRQ_PENDING/IRQ_INPROGRESS logic from |
| 542 | * applying to them. We EOI them late to avoid re-entering. | 542 | * applying to them. We EOI them late to avoid re-entering. |
| 543 | * We mark IPI's with SA_INTERRUPT as they must run with | 543 | * We mark IPI's with IRQF_DISABLED as they must run with |
| 544 | * irqs disabled. | 544 | * irqs disabled. |
| 545 | */ | 545 | */ |
| 546 | mpic_eoi(mpic); | 546 | mpic_eoi(mpic); |
| @@ -1027,14 +1027,17 @@ void mpic_request_ipis(void) | |||
| 1027 | 1027 | ||
| 1028 | printk("requesting IPIs ... \n"); | 1028 | printk("requesting IPIs ... \n"); |
| 1029 | 1029 | ||
| 1030 | /* IPIs are marked SA_INTERRUPT as they must run with irqs disabled */ | 1030 | /* |
| 1031 | request_irq(mpic->ipi_offset+0, mpic_ipi_action, SA_INTERRUPT, | 1031 | * IPIs are marked IRQF_DISABLED as they must run with irqs |
| 1032 | * disabled | ||
| 1033 | */ | ||
| 1034 | request_irq(mpic->ipi_offset+0, mpic_ipi_action, IRQF_DISABLED, | ||
| 1032 | "IPI0 (call function)", mpic); | 1035 | "IPI0 (call function)", mpic); |
| 1033 | request_irq(mpic->ipi_offset+1, mpic_ipi_action, SA_INTERRUPT, | 1036 | request_irq(mpic->ipi_offset+1, mpic_ipi_action, IRQF_DISABLED, |
| 1034 | "IPI1 (reschedule)", mpic); | 1037 | "IPI1 (reschedule)", mpic); |
| 1035 | request_irq(mpic->ipi_offset+2, mpic_ipi_action, SA_INTERRUPT, | 1038 | request_irq(mpic->ipi_offset+2, mpic_ipi_action, IRQF_DISABLED, |
| 1036 | "IPI2 (unused)", mpic); | 1039 | "IPI2 (unused)", mpic); |
| 1037 | request_irq(mpic->ipi_offset+3, mpic_ipi_action, SA_INTERRUPT, | 1040 | request_irq(mpic->ipi_offset+3, mpic_ipi_action, IRQF_DISABLED, |
| 1038 | "IPI3 (debugger break)", mpic); | 1041 | "IPI3 (debugger break)", mpic); |
| 1039 | 1042 | ||
| 1040 | printk("IPIs requested... \n"); | 1043 | printk("IPIs requested... \n"); |
