aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 4956ed092838..11ac0eb0bce7 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2168,7 +2168,7 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state)
2168 * just go back and repeat. 2168 * just go back and repeat.
2169 */ 2169 */
2170 rq = task_rq_lock(p, &flags); 2170 rq = task_rq_lock(p, &flags);
2171 trace_sched_wait_task(rq, p); 2171 trace_sched_wait_task(p);
2172 running = task_running(rq, p); 2172 running = task_running(rq, p);
2173 on_rq = p->se.on_rq; 2173 on_rq = p->se.on_rq;
2174 ncsw = 0; 2174 ncsw = 0;
@@ -2439,7 +2439,7 @@ out_activate:
2439 success = 1; 2439 success = 1;
2440 2440
2441out_running: 2441out_running:
2442 trace_sched_wakeup(rq, p, success); 2442 trace_sched_wakeup(p, success);
2443 check_preempt_curr(rq, p, wake_flags); 2443 check_preempt_curr(rq, p, wake_flags);
2444 2444
2445 p->state = TASK_RUNNING; 2445 p->state = TASK_RUNNING;
@@ -2613,7 +2613,7 @@ void wake_up_new_task(struct task_struct *p, unsigned long clone_flags)
2613 2613
2614 rq = task_rq_lock(p, &flags); 2614 rq = task_rq_lock(p, &flags);
2615 activate_task(rq, p, 0); 2615 activate_task(rq, p, 0);
2616 trace_sched_wakeup_new(rq, p, 1); 2616 trace_sched_wakeup_new(p, 1);
2617 check_preempt_curr(rq, p, WF_FORK); 2617 check_preempt_curr(rq, p, WF_FORK);
2618#ifdef CONFIG_SMP 2618#ifdef CONFIG_SMP
2619 if (p->sched_class->task_woken) 2619 if (p->sched_class->task_woken)
@@ -2833,7 +2833,7 @@ context_switch(struct rq *rq, struct task_struct *prev,
2833 struct mm_struct *mm, *oldmm; 2833 struct mm_struct *mm, *oldmm;
2834 2834
2835 prepare_task_switch(rq, prev, next); 2835 prepare_task_switch(rq, prev, next);
2836 trace_sched_switch(rq, prev, next); 2836 trace_sched_switch(prev, next);
2837 mm = next->mm; 2837 mm = next->mm;
2838 oldmm = prev->active_mm; 2838 oldmm = prev->active_mm;
2839 /* 2839 /*