[PATCH] irq-flags: POWERPC: Use the new IRQF_ constants
Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@elte.hu> Cc: "David S. Miller" <davem@davemloft.net> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
733ea869e5
commit
6714465e83
|
@ -304,11 +304,11 @@ static void iic_request_ipi(int ipi, const char *name)
|
||||||
int irq;
|
int irq;
|
||||||
|
|
||||||
irq = iic_ipi_to_irq(ipi);
|
irq = iic_ipi_to_irq(ipi);
|
||||||
/* IPIs are marked SA_INTERRUPT as they must run with irqs
|
/* IPIs are marked IRQF_DISABLED as they must run with irqs
|
||||||
* disabled */
|
* disabled */
|
||||||
get_irq_desc(irq)->chip = &iic_pic;
|
get_irq_desc(irq)->chip = &iic_pic;
|
||||||
get_irq_desc(irq)->status |= IRQ_PER_CPU;
|
get_irq_desc(irq)->status |= IRQ_PER_CPU;
|
||||||
request_irq(irq, iic_ipi_action, SA_INTERRUPT, name, NULL);
|
request_irq(irq, iic_ipi_action, IRQF_DISABLED, name, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
void iic_request_IPIs(void)
|
void iic_request_IPIs(void)
|
||||||
|
|
|
@ -274,19 +274,19 @@ spu_request_irqs(struct spu *spu)
|
||||||
|
|
||||||
snprintf(spu->irq_c0, sizeof (spu->irq_c0), "spe%02d.0", spu->number);
|
snprintf(spu->irq_c0, sizeof (spu->irq_c0), "spe%02d.0", spu->number);
|
||||||
ret = request_irq(irq_base + spu->isrc,
|
ret = request_irq(irq_base + spu->isrc,
|
||||||
spu_irq_class_0, SA_INTERRUPT, spu->irq_c0, spu);
|
spu_irq_class_0, IRQF_DISABLED, spu->irq_c0, spu);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
snprintf(spu->irq_c1, sizeof (spu->irq_c1), "spe%02d.1", spu->number);
|
snprintf(spu->irq_c1, sizeof (spu->irq_c1), "spe%02d.1", spu->number);
|
||||||
ret = request_irq(irq_base + IIC_CLASS_STRIDE + spu->isrc,
|
ret = request_irq(irq_base + IIC_CLASS_STRIDE + spu->isrc,
|
||||||
spu_irq_class_1, SA_INTERRUPT, spu->irq_c1, spu);
|
spu_irq_class_1, IRQF_DISABLED, spu->irq_c1, spu);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out1;
|
goto out1;
|
||||||
|
|
||||||
snprintf(spu->irq_c2, sizeof (spu->irq_c2), "spe%02d.2", spu->number);
|
snprintf(spu->irq_c2, sizeof (spu->irq_c2), "spe%02d.2", spu->number);
|
||||||
ret = request_irq(irq_base + 2*IIC_CLASS_STRIDE + spu->isrc,
|
ret = request_irq(irq_base + 2*IIC_CLASS_STRIDE + spu->isrc,
|
||||||
spu_irq_class_2, SA_INTERRUPT, spu->irq_c2, spu);
|
spu_irq_class_2, IRQF_DISABLED, spu->irq_c2, spu);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out2;
|
goto out2;
|
||||||
goto out;
|
goto out;
|
||||||
|
|
|
@ -381,7 +381,7 @@ static struct irqaction xmon_action = {
|
||||||
|
|
||||||
static struct irqaction gatwick_cascade_action = {
|
static struct irqaction gatwick_cascade_action = {
|
||||||
.handler = gatwick_action,
|
.handler = gatwick_action,
|
||||||
.flags = SA_INTERRUPT,
|
.flags = IRQF_DISABLED,
|
||||||
.mask = CPU_MASK_NONE,
|
.mask = CPU_MASK_NONE,
|
||||||
.name = "cascade",
|
.name = "cascade",
|
||||||
};
|
};
|
||||||
|
|
|
@ -377,7 +377,7 @@ static void __init psurge_dual_sync_tb(int cpu_nr)
|
||||||
|
|
||||||
static struct irqaction psurge_irqaction = {
|
static struct irqaction psurge_irqaction = {
|
||||||
.handler = psurge_primary_intr,
|
.handler = psurge_primary_intr,
|
||||||
.flags = SA_INTERRUPT,
|
.flags = IRQF_DISABLED,
|
||||||
.mask = CPU_MASK_NONE,
|
.mask = CPU_MASK_NONE,
|
||||||
.name = "primary IPI",
|
.name = "primary IPI",
|
||||||
};
|
};
|
||||||
|
|
|
@ -59,7 +59,7 @@ static struct radix_tree_root irq_map = RADIX_TREE_INIT(GFP_ATOMIC);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Mark IPIs as higher priority so we can take them inside interrupts that
|
* Mark IPIs as higher priority so we can take them inside interrupts that
|
||||||
* arent marked SA_INTERRUPT
|
* arent marked IRQF_DISABLED
|
||||||
*/
|
*/
|
||||||
#define IPI_PRIORITY 4
|
#define IPI_PRIORITY 4
|
||||||
|
|
||||||
|
@ -586,9 +586,12 @@ void xics_request_IPIs(void)
|
||||||
{
|
{
|
||||||
virt_irq_to_real_map[XICS_IPI] = XICS_IPI;
|
virt_irq_to_real_map[XICS_IPI] = XICS_IPI;
|
||||||
|
|
||||||
/* IPIs are marked SA_INTERRUPT as they must run with irqs disabled */
|
/*
|
||||||
request_irq(irq_offset_up(XICS_IPI), xics_ipi_action, SA_INTERRUPT,
|
* IPIs are marked IRQF_DISABLED as they must run with irqs
|
||||||
"IPI", NULL);
|
* disabled
|
||||||
|
*/
|
||||||
|
request_irq(irq_offset_up(XICS_IPI), xics_ipi_action,
|
||||||
|
IRQF_DISABLED, "IPI", NULL);
|
||||||
get_irq_desc(irq_offset_up(XICS_IPI))->status |= IRQ_PER_CPU;
|
get_irq_desc(irq_offset_up(XICS_IPI))->status |= IRQ_PER_CPU;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -167,7 +167,7 @@ static struct resource pic_edgectrl_iores = {
|
||||||
|
|
||||||
static struct irqaction i8259_irqaction = {
|
static struct irqaction i8259_irqaction = {
|
||||||
.handler = no_action,
|
.handler = no_action,
|
||||||
.flags = SA_INTERRUPT,
|
.flags = IRQF_DISABLED,
|
||||||
.mask = CPU_MASK_NONE,
|
.mask = CPU_MASK_NONE,
|
||||||
.name = "82c59 secondary cascade",
|
.name = "82c59 secondary cascade",
|
||||||
};
|
};
|
||||||
|
|
|
@ -540,7 +540,7 @@ static void mpic_end_ipi(unsigned int irq)
|
||||||
* IPIs are marked IRQ_PER_CPU. This has the side effect of
|
* IPIs are marked IRQ_PER_CPU. This has the side effect of
|
||||||
* preventing the IRQ_PENDING/IRQ_INPROGRESS logic from
|
* preventing the IRQ_PENDING/IRQ_INPROGRESS logic from
|
||||||
* applying to them. We EOI them late to avoid re-entering.
|
* applying to them. We EOI them late to avoid re-entering.
|
||||||
* We mark IPI's with SA_INTERRUPT as they must run with
|
* We mark IPI's with IRQF_DISABLED as they must run with
|
||||||
* irqs disabled.
|
* irqs disabled.
|
||||||
*/
|
*/
|
||||||
mpic_eoi(mpic);
|
mpic_eoi(mpic);
|
||||||
|
@ -1027,14 +1027,17 @@ void mpic_request_ipis(void)
|
||||||
|
|
||||||
printk("requesting IPIs ... \n");
|
printk("requesting IPIs ... \n");
|
||||||
|
|
||||||
/* IPIs are marked SA_INTERRUPT as they must run with irqs disabled */
|
/*
|
||||||
request_irq(mpic->ipi_offset+0, mpic_ipi_action, SA_INTERRUPT,
|
* IPIs are marked IRQF_DISABLED as they must run with irqs
|
||||||
|
* disabled
|
||||||
|
*/
|
||||||
|
request_irq(mpic->ipi_offset+0, mpic_ipi_action, IRQF_DISABLED,
|
||||||
"IPI0 (call function)", mpic);
|
"IPI0 (call function)", mpic);
|
||||||
request_irq(mpic->ipi_offset+1, mpic_ipi_action, SA_INTERRUPT,
|
request_irq(mpic->ipi_offset+1, mpic_ipi_action, IRQF_DISABLED,
|
||||||
"IPI1 (reschedule)", mpic);
|
"IPI1 (reschedule)", mpic);
|
||||||
request_irq(mpic->ipi_offset+2, mpic_ipi_action, SA_INTERRUPT,
|
request_irq(mpic->ipi_offset+2, mpic_ipi_action, IRQF_DISABLED,
|
||||||
"IPI2 (unused)", mpic);
|
"IPI2 (unused)", mpic);
|
||||||
request_irq(mpic->ipi_offset+3, mpic_ipi_action, SA_INTERRUPT,
|
request_irq(mpic->ipi_offset+3, mpic_ipi_action, IRQF_DISABLED,
|
||||||
"IPI3 (debugger break)", mpic);
|
"IPI3 (debugger break)", mpic);
|
||||||
|
|
||||||
printk("IPIs requested... \n");
|
printk("IPIs requested... \n");
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
#define fd_disable_irq() disable_irq(FLOPPY_IRQ)
|
#define fd_disable_irq() disable_irq(FLOPPY_IRQ)
|
||||||
#define fd_cacheflush(addr,size) /* nothing */
|
#define fd_cacheflush(addr,size) /* nothing */
|
||||||
#define fd_request_irq() request_irq(FLOPPY_IRQ, floppy_interrupt, \
|
#define fd_request_irq() request_irq(FLOPPY_IRQ, floppy_interrupt, \
|
||||||
SA_INTERRUPT, "floppy", NULL)
|
IRQF_DISABLED, "floppy", NULL)
|
||||||
#define fd_free_irq() free_irq(FLOPPY_IRQ, NULL);
|
#define fd_free_irq() free_irq(FLOPPY_IRQ, NULL);
|
||||||
|
|
||||||
#ifdef CONFIG_PCI
|
#ifdef CONFIG_PCI
|
||||||
|
|
|
@ -63,7 +63,6 @@ typedef struct {
|
||||||
* SA_FLAGS values:
|
* SA_FLAGS values:
|
||||||
*
|
*
|
||||||
* SA_ONSTACK is not currently supported, but will allow sigaltstack(2).
|
* SA_ONSTACK is not currently supported, but will allow sigaltstack(2).
|
||||||
* SA_INTERRUPT is a no-op, but left due to historical reasons. Use the
|
|
||||||
* SA_RESTART flag to get restarting signals (which were the default long ago)
|
* SA_RESTART flag to get restarting signals (which were the default long ago)
|
||||||
* SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
|
* SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
|
||||||
* SA_RESETHAND clears the handler when the signal is delivered.
|
* SA_RESETHAND clears the handler when the signal is delivered.
|
||||||
|
@ -83,7 +82,6 @@ typedef struct {
|
||||||
|
|
||||||
#define SA_NOMASK SA_NODEFER
|
#define SA_NOMASK SA_NODEFER
|
||||||
#define SA_ONESHOT SA_RESETHAND
|
#define SA_ONESHOT SA_RESETHAND
|
||||||
#define SA_INTERRUPT 0x20000000u /* dummy -- ignored */
|
|
||||||
|
|
||||||
#define SA_RESTORER 0x04000000U
|
#define SA_RESTORER 0x04000000U
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue