Commit b2590fb0 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] ppc64: remove iseries interrupt recursion workaround

From: Anton Blanchard <anton@samba.org>

It turns out we do avoid irq recursion on iseries so remove the workaround.
parent f1061519
...@@ -376,10 +376,8 @@ static inline int handle_irq_event(int irq, struct pt_regs *regs, ...@@ -376,10 +376,8 @@ static inline int handle_irq_event(int irq, struct pt_regs *regs,
int status = 0; int status = 0;
int retval = 0; int retval = 0;
#ifndef CONFIG_PPC_ISERIES
if (!(action->flags & SA_INTERRUPT)) if (!(action->flags & SA_INTERRUPT))
local_irq_enable(); local_irq_enable();
#endif
do { do {
status |= action->flags; status |= action->flags;
...@@ -388,9 +386,7 @@ static inline int handle_irq_event(int irq, struct pt_regs *regs, ...@@ -388,9 +386,7 @@ static inline int handle_irq_event(int irq, struct pt_regs *regs,
} while (action); } while (action);
if (status & SA_SAMPLE_RANDOM) if (status & SA_SAMPLE_RANDOM)
add_interrupt_randomness(irq); add_interrupt_randomness(irq);
#ifndef CONFIG_PPC_ISERIES
local_irq_disable(); local_irq_disable();
#endif
return retval; return retval;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment