aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index e507af086b42..c3ad3427a2a5 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2783,7 +2783,13 @@ static void finish_task_switch(struct rq *rq, struct task_struct *prev)
2783 */ 2783 */
2784 prev_state = prev->state; 2784 prev_state = prev->state;
2785 finish_arch_switch(prev); 2785 finish_arch_switch(prev);
2786#ifdef __ARCH_WANT_INTERRUPTS_ON_CTXSW
2787 local_irq_disable();
2788#endif /* __ARCH_WANT_INTERRUPTS_ON_CTXSW */
2786 perf_event_task_sched_in(current); 2789 perf_event_task_sched_in(current);
2790#ifdef __ARCH_WANT_INTERRUPTS_ON_CTXSW
2791 local_irq_enable();
2792#endif /* __ARCH_WANT_INTERRUPTS_ON_CTXSW */
2787 finish_lock_switch(rq, prev); 2793 finish_lock_switch(rq, prev);
2788 2794
2789 fire_sched_in_preempt_notifiers(current); 2795 fire_sched_in_preempt_notifiers(current);