diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/irq-entry-common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/irq-entry-common.h b/include/linux/irq-entry-common.h index 7ab41eec549f..167fba7dbf04 100644 --- a/include/linux/irq-entry-common.h +++ b/include/linux/irq-entry-common.h @@ -474,8 +474,6 @@ static inline void irqentry_exit_to_kernel_mode_preempt(struct pt_regs *regs, if (IS_ENABLED(CONFIG_PREEMPTION)) irqentry_exit_cond_resched(); - - hrtimer_rearm_deferred(); } /** @@ -501,6 +499,7 @@ irqentry_exit_to_kernel_mode_after_preempt(struct pt_regs *regs, irqentry_state_ */ if (state.exit_rcu) { instrumentation_begin(); + hrtimer_rearm_deferred(); /* Tell the tracer that IRET will enable interrupts */ trace_hardirqs_on_prepare(); lockdep_hardirqs_on_prepare(); @@ -511,6 +510,7 @@ irqentry_exit_to_kernel_mode_after_preempt(struct pt_regs *regs, irqentry_state_ } instrumentation_begin(); + hrtimer_rearm_deferred(); /* Covers both tracing and lockdep */ trace_hardirqs_on(); instrumentation_end(); |