aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorJonathan Herman <hermanjl@cs.unc.edu>2011-10-13 16:17:13 -0400
committerJonathan Herman <hermanjl@cs.unc.edu>2011-10-13 16:17:13 -0400
commit0836d628227984b343e5ed53e93ebed2252776f7 (patch)
treee5c73797197ecd232c047220fa1a3a718f19d42b /kernel
parent528b42be373ca461bd8538a58385a1515c98489c (diff)
parentf5001920607dee542ff99a058c13080307de0c73 (diff)
Merge branch 'wip-mc' of ssh://cvs.cs.unc.edu/cvs/proj/litmus/repo/litmus2010 into wip-mc
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index c5d775079027..71907dcd8112 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3810,6 +3810,7 @@ need_resched:
3810 release_kernel_lock(prev); 3810 release_kernel_lock(prev);
3811need_resched_nonpreemptible: 3811need_resched_nonpreemptible:
3812 TS_SCHED_START; 3812 TS_SCHED_START;
3813 TS_LVLA_SCHED_START;
3813 sched_trace_task_switch_away(prev); 3814 sched_trace_task_switch_away(prev);
3814 3815
3815 schedule_debug(prev); 3816 schedule_debug(prev);
@@ -3859,6 +3860,7 @@ need_resched_nonpreemptible:
3859 rq->curr = next; 3860 rq->curr = next;
3860 ++*switch_count; 3861 ++*switch_count;
3861 3862
3863 TS_LVLA_SCHED_END(next);
3862 TS_SCHED_END(next); 3864 TS_SCHED_END(next);
3863 TS_CXS_START(next); 3865 TS_CXS_START(next);
3864 context_switch(rq, prev, next); /* unlocks the rq */ 3866 context_switch(rq, prev, next); /* unlocks the rq */