aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc/syslib/open_pic.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ppc/syslib/open_pic.c')
-rw-r--r--arch/ppc/syslib/open_pic.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/arch/ppc/syslib/open_pic.c b/arch/ppc/syslib/open_pic.c
index 08973663fa24..aa0b95788705 100644
--- a/arch/ppc/syslib/open_pic.c
+++ b/arch/ppc/syslib/open_pic.c
@@ -575,18 +575,21 @@ void openpic_request_IPIs(void)
575 if (OpenPIC == NULL) 575 if (OpenPIC == NULL)
576 return; 576 return;
577 577
578 /* IPIs are marked SA_INTERRUPT as they must run with irqs disabled */ 578 /*
579 * IPIs are marked IRQF_DISABLED as they must run with irqs
580 * disabled
581 */
579 request_irq(OPENPIC_VEC_IPI+open_pic_irq_offset, 582 request_irq(OPENPIC_VEC_IPI+open_pic_irq_offset,
580 openpic_ipi_action, SA_INTERRUPT, 583 openpic_ipi_action, IRQF_DISABLED,
581 "IPI0 (call function)", NULL); 584 "IPI0 (call function)", NULL);
582 request_irq(OPENPIC_VEC_IPI+open_pic_irq_offset+1, 585 request_irq(OPENPIC_VEC_IPI+open_pic_irq_offset+1,
583 openpic_ipi_action, SA_INTERRUPT, 586 openpic_ipi_action, IRQF_DISABLED,
584 "IPI1 (reschedule)", NULL); 587 "IPI1 (reschedule)", NULL);
585 request_irq(OPENPIC_VEC_IPI+open_pic_irq_offset+2, 588 request_irq(OPENPIC_VEC_IPI+open_pic_irq_offset+2,
586 openpic_ipi_action, SA_INTERRUPT, 589 openpic_ipi_action, IRQF_DISABLED,
587 "IPI2 (invalidate tlb)", NULL); 590 "IPI2 (invalidate tlb)", NULL);
588 request_irq(OPENPIC_VEC_IPI+open_pic_irq_offset+3, 591 request_irq(OPENPIC_VEC_IPI+open_pic_irq_offset+3,
589 openpic_ipi_action, SA_INTERRUPT, 592 openpic_ipi_action, IRQF_DISABLED,
590 "IPI3 (xmon break)", NULL); 593 "IPI3 (xmon break)", NULL);
591 594
592 for ( i = 0; i < OPENPIC_NUM_IPI ; i++ ) 595 for ( i = 0; i < OPENPIC_NUM_IPI ; i++ )
@@ -691,7 +694,7 @@ openpic_init_nmi_irq(u_int irq)
691 694
692static struct irqaction openpic_cascade_irqaction = { 695static struct irqaction openpic_cascade_irqaction = {
693 .handler = no_action, 696 .handler = no_action,
694 .flags = SA_INTERRUPT, 697 .flags = IRQF_DISABLED,
695 .mask = CPU_MASK_NONE, 698 .mask = CPU_MASK_NONE,
696}; 699};
697 700