diff options
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/amiga/amiints.c | 2 | ||||
-rw-r--r-- | arch/m68k/amiga/cia.c | 2 | ||||
-rw-r--r-- | arch/m68k/kernel/ints.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/amiga/amiints.c b/arch/m68k/amiga/amiints.c index f9403f4640a1..96c79d840cff 100644 --- a/arch/m68k/amiga/amiints.c +++ b/arch/m68k/amiga/amiints.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * | 22 | * |
23 | * 07/08/99: rewamp of the interrupt handling - we now have two types of | 23 | * 07/08/99: rewamp of the interrupt handling - we now have two types of |
24 | * interrupts, normal and fast handlers, fast handlers being | 24 | * interrupts, normal and fast handlers, fast handlers being |
25 | * marked with SA_INTERRUPT and runs with all other interrupts | 25 | * marked with IRQF_DISABLED and runs with all other interrupts |
26 | * disabled. Normal interrupts disable their own source but | 26 | * disabled. Normal interrupts disable their own source but |
27 | * run with all other interrupt sources enabled. | 27 | * run with all other interrupt sources enabled. |
28 | * PORTS and EXTER interrupts are always shared even if the | 28 | * PORTS and EXTER interrupts are always shared even if the |
diff --git a/arch/m68k/amiga/cia.c b/arch/m68k/amiga/cia.c index 0956e45399e5..dbad30054721 100644 --- a/arch/m68k/amiga/cia.c +++ b/arch/m68k/amiga/cia.c | |||
@@ -176,5 +176,5 @@ void __init cia_init_IRQ(struct ciabase *base) | |||
176 | /* override auto int and install CIA handler */ | 176 | /* override auto int and install CIA handler */ |
177 | m68k_setup_irq_controller(&auto_irq_controller, base->handler_irq, 1); | 177 | m68k_setup_irq_controller(&auto_irq_controller, base->handler_irq, 1); |
178 | m68k_irq_startup(base->handler_irq); | 178 | m68k_irq_startup(base->handler_irq); |
179 | request_irq(base->handler_irq, cia_handler, SA_SHIRQ, base->name, base); | 179 | request_irq(base->handler_irq, cia_handler, IRQF_SHARED, base->name, base); |
180 | } | 180 | } |
diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c index e969f0477640..b33e37fb7b0e 100644 --- a/arch/m68k/kernel/ints.c +++ b/arch/m68k/kernel/ints.c | |||
@@ -192,7 +192,7 @@ int setup_irq(unsigned int irq, struct irq_node *node) | |||
192 | prev = irq_list + irq; | 192 | prev = irq_list + irq; |
193 | if (*prev) { | 193 | if (*prev) { |
194 | /* Can't share interrupts unless both agree to */ | 194 | /* Can't share interrupts unless both agree to */ |
195 | if (!((*prev)->flags & node->flags & SA_SHIRQ)) { | 195 | if (!((*prev)->flags & node->flags & IRQF_SHARED)) { |
196 | spin_unlock_irqrestore(&contr->lock, flags); | 196 | spin_unlock_irqrestore(&contr->lock, flags); |
197 | return -EBUSY; | 197 | return -EBUSY; |
198 | } | 198 | } |