diff options
-rw-r--r-- | kernel/softirq.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index f2a934673008..24a921bcf04f 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c | |||
@@ -322,18 +322,10 @@ void irq_enter(void) | |||
322 | 322 | ||
323 | static inline void invoke_softirq(void) | 323 | static inline void invoke_softirq(void) |
324 | { | 324 | { |
325 | if (!force_irqthreads) { | 325 | if (!force_irqthreads) |
326 | #ifdef __ARCH_IRQ_EXIT_IRQS_DISABLED | ||
327 | __do_softirq(); | 326 | __do_softirq(); |
328 | #else | 327 | else |
329 | do_softirq(); | ||
330 | #endif | ||
331 | } else { | ||
332 | __local_bh_disable((unsigned long)__builtin_return_address(0), | ||
333 | SOFTIRQ_OFFSET); | ||
334 | wakeup_softirqd(); | 328 | wakeup_softirqd(); |
335 | __local_bh_enable(SOFTIRQ_OFFSET); | ||
336 | } | ||
337 | } | 329 | } |
338 | 330 | ||
339 | /* | 331 | /* |