diff options
-rw-r--r-- | kernel/softirq.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index f42ff97e1f8f..dce38fac4f32 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c | |||
@@ -334,9 +334,7 @@ static inline void invoke_softirq(void) | |||
334 | void irq_exit(void) | 334 | void irq_exit(void) |
335 | { | 335 | { |
336 | #ifndef __ARCH_IRQ_EXIT_IRQS_DISABLED | 336 | #ifndef __ARCH_IRQ_EXIT_IRQS_DISABLED |
337 | unsigned long flags; | 337 | local_irq_disable(); |
338 | |||
339 | local_irq_save(flags); | ||
340 | #else | 338 | #else |
341 | WARN_ON_ONCE(!irqs_disabled()); | 339 | WARN_ON_ONCE(!irqs_disabled()); |
342 | #endif | 340 | #endif |
@@ -353,9 +351,6 @@ void irq_exit(void) | |||
353 | tick_nohz_irq_exit(); | 351 | tick_nohz_irq_exit(); |
354 | #endif | 352 | #endif |
355 | rcu_irq_exit(); | 353 | rcu_irq_exit(); |
356 | #ifndef __ARCH_IRQ_EXIT_IRQS_DISABLED | ||
357 | local_irq_restore(flags); | ||
358 | #endif | ||
359 | } | 354 | } |
360 | 355 | ||
361 | /* | 356 | /* |