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 fbaf3128d010..39aa9c7e22c0 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2155,7 +2155,7 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state)
2155 * just go back and repeat. 2155 * just go back and repeat.
2156 */ 2156 */
2157 rq = task_rq_lock(p, &flags); 2157 rq = task_rq_lock(p, &flags);
2158 trace_sched_wait_task(rq, p); 2158 trace_sched_wait_task(p);
2159 running = task_running(rq, p); 2159 running = task_running(rq, p);
2160 on_rq = p->se.on_rq; 2160 on_rq = p->se.on_rq;
2161 ncsw = 0; 2161 ncsw = 0;
@@ -2426,7 +2426,7 @@ out_activate:
2426 success = 1; 2426 success = 1;
2427 2427
2428out_running: 2428out_running:
2429 trace_sched_wakeup(rq, p, success); 2429 trace_sched_wakeup(p, success);
2430 check_preempt_curr(rq, p, wake_flags); 2430 check_preempt_curr(rq, p, wake_flags);
2431 2431
2432 p->state = TASK_RUNNING; 2432 p->state = TASK_RUNNING;
@@ -2600,7 +2600,7 @@ void wake_up_new_task(struct task_struct *p, unsigned long clone_flags)
2600 2600
2601 rq = task_rq_lock(p, &flags); 2601 rq = task_rq_lock(p, &flags);
2602 activate_task(rq, p, 0); 2602 activate_task(rq, p, 0);
2603 trace_sched_wakeup_new(rq, p, 1); 2603 trace_sched_wakeup_new(p, 1);
2604 check_preempt_curr(rq, p, WF_FORK); 2604 check_preempt_curr(rq, p, WF_FORK);
2605#ifdef CONFIG_SMP 2605#ifdef CONFIG_SMP
2606 if (p->sched_class->task_woken) 2606 if (p->sched_class->task_woken)
@@ -2820,7 +2820,7 @@ context_switch(struct rq *rq, struct task_struct *prev,
2820 struct mm_struct *mm, *oldmm; 2820 struct mm_struct *mm, *oldmm;
2821 2821
2822 prepare_task_switch(rq, prev, next); 2822 prepare_task_switch(rq, prev, next);
2823 trace_sched_switch(rq, prev, next); 2823 trace_sched_switch(prev, next);
2824 mm = next->mm; 2824 mm = next->mm;
2825 oldmm = prev->active_mm; 2825 oldmm = prev->active_mm;
2826 /* 2826 /*