[PATCH] genirq: remove IRQ_DISABLED
Now that disable_irq() defaults to delayed-disable semantics, the IRQ_DISABLED flag is not needed anymore. Signed-off-by: Ingo Molnar <mingo@elte.hu> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
76d2160147
commit
d7e25f3394
|
@ -159,8 +159,7 @@ void __init init_IRQ(void)
|
|||
int irq;
|
||||
|
||||
for (irq = 0; irq < NR_IRQS; irq++)
|
||||
irq_desc[irq].status |= IRQ_NOREQUEST | IRQ_DELAYED_DISABLE |
|
||||
IRQ_NOPROBE;
|
||||
irq_desc[irq].status |= IRQ_NOREQUEST | IRQ_NOPROBE;
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
bad_irq_desc.affinity = CPU_MASK_ALL;
|
||||
|
|
|
@ -1281,11 +1281,9 @@ static void ioapic_register_intr(int irq, int vector, unsigned long trigger)
|
|||
trigger == IOAPIC_LEVEL)
|
||||
set_irq_chip_and_handler_name(irq, &ioapic_chip,
|
||||
handle_fasteoi_irq, "fasteoi");
|
||||
else {
|
||||
irq_desc[irq].status |= IRQ_DELAYED_DISABLE;
|
||||
else
|
||||
set_irq_chip_and_handler_name(irq, &ioapic_chip,
|
||||
handle_edge_irq, "edge");
|
||||
}
|
||||
set_intr_gate(vector, interrupt[irq]);
|
||||
}
|
||||
|
||||
|
|
|
@ -305,8 +305,6 @@ static int pmac_pic_host_map(struct irq_host *h, unsigned int virq,
|
|||
level = !!(level_mask[hw >> 5] & (1UL << (hw & 0x1f)));
|
||||
if (level)
|
||||
desc->status |= IRQ_LEVEL;
|
||||
else
|
||||
desc->status |= IRQ_DELAYED_DISABLE;
|
||||
set_irq_chip_and_handler(virq, &pmac_pic, level ?
|
||||
handle_level_irq : handle_edge_irq);
|
||||
return 0;
|
||||
|
|
|
@ -810,12 +810,10 @@ static void ioapic_register_intr(int irq, int vector, unsigned long trigger)
|
|||
trigger == IOAPIC_LEVEL)
|
||||
set_irq_chip_and_handler_name(irq, &ioapic_chip,
|
||||
handle_fasteoi_irq, "fasteoi");
|
||||
else {
|
||||
irq_desc[irq].status |= IRQ_DELAYED_DISABLE;
|
||||
else
|
||||
set_irq_chip_and_handler_name(irq, &ioapic_chip,
|
||||
handle_edge_irq, "edge");
|
||||
}
|
||||
}
|
||||
static void __init setup_IO_APIC_irq(int apic, int pin, int idx, int irq)
|
||||
{
|
||||
struct IO_APIC_route_entry entry;
|
||||
|
|
|
@ -57,10 +57,9 @@ typedef void fastcall (*irq_flow_handler_t)(unsigned int irq,
|
|||
#define IRQ_NOPROBE 0x00020000 /* IRQ is not valid for probing */
|
||||
#define IRQ_NOREQUEST 0x00040000 /* IRQ cannot be requested */
|
||||
#define IRQ_NOAUTOEN 0x00080000 /* IRQ will not be enabled on request irq */
|
||||
#define IRQ_DELAYED_DISABLE 0x00100000 /* IRQ disable (masking) happens delayed. */
|
||||
#define IRQ_WAKEUP 0x00200000 /* IRQ triggers system wakeup */
|
||||
#define IRQ_MOVE_PENDING 0x00400000 /* need to re-target IRQ destination */
|
||||
#define IRQ_NO_BALANCING 0x00800000 /* IRQ is excluded from balancing */
|
||||
#define IRQ_WAKEUP 0x00100000 /* IRQ triggers system wakeup */
|
||||
#define IRQ_MOVE_PENDING 0x00200000 /* need to re-target IRQ destination */
|
||||
#define IRQ_NO_BALANCING 0x00400000 /* IRQ is excluded from balancing */
|
||||
|
||||
#ifdef CONFIG_IRQ_PER_CPU
|
||||
# define CHECK_IRQ_PER_CPU(var) ((var) & IRQ_PER_CPU)
|
||||
|
|
Loading…
Reference in New Issue