diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/softirq.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index 24a921bcf04f..f42ff97e1f8f 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c | |||
| @@ -343,7 +343,7 @@ void irq_exit(void) | |||
| 343 | 343 | ||
| 344 | account_irq_exit_time(current); | 344 | account_irq_exit_time(current); |
| 345 | trace_hardirq_exit(); | 345 | trace_hardirq_exit(); |
| 346 | sub_preempt_count(IRQ_EXIT_OFFSET); | 346 | sub_preempt_count(HARDIRQ_OFFSET); |
| 347 | if (!in_interrupt() && local_softirq_pending()) | 347 | if (!in_interrupt() && local_softirq_pending()) |
| 348 | invoke_softirq(); | 348 | invoke_softirq(); |
| 349 | 349 | ||
| @@ -353,7 +353,6 @@ void irq_exit(void) | |||
| 353 | tick_nohz_irq_exit(); | 353 | tick_nohz_irq_exit(); |
| 354 | #endif | 354 | #endif |
| 355 | rcu_irq_exit(); | 355 | rcu_irq_exit(); |
| 356 | sched_preempt_enable_no_resched(); | ||
| 357 | #ifndef __ARCH_IRQ_EXIT_IRQS_DISABLED | 356 | #ifndef __ARCH_IRQ_EXIT_IRQS_DISABLED |
| 358 | local_irq_restore(flags); | 357 | local_irq_restore(flags); |
| 359 | #endif | 358 | #endif |
