diff options
author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-04-26 13:42:00 -0400 |
---|---|---|
committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-04-26 13:42:00 -0400 |
commit | 01f72a7fb0f20559a654ca2c79169ee57f12e904 (patch) | |
tree | 819ac703d79cd6d06ae70de8fd7d7e255264869f /kernel | |
parent | 9c942ebab15612c6a704a3b6a437543cd5df24c3 (diff) |
Measure timer re-arming in the proper location
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/sched.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 1701eaebb79c..adb5e923cc61 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -5520,20 +5520,16 @@ need_resched_nonpreemptible: | |||
5520 | spin_unlock_irq(&rq->lock); | 5520 | spin_unlock_irq(&rq->lock); |
5521 | } | 5521 | } |
5522 | 5522 | ||
5523 | TS_SCHED2_START(current); | ||
5524 | sched_trace_task_switch_to(current); | 5523 | sched_trace_task_switch_to(current); |
5525 | 5524 | ||
5526 | post_schedule(rq); | 5525 | post_schedule(rq); |
5527 | 5526 | ||
5528 | if (unlikely(reacquire_kernel_lock(current) < 0)) { | 5527 | if (unlikely(reacquire_kernel_lock(current) < 0)) { |
5529 | TS_SCHED2_END(current); | ||
5530 | goto need_resched_nonpreemptible; | 5528 | goto need_resched_nonpreemptible; |
5531 | } | 5529 | } |
5532 | 5530 | ||
5533 | preempt_enable_no_resched(); | 5531 | preempt_enable_no_resched(); |
5534 | 5532 | ||
5535 | TS_SCHED2_END(current); | ||
5536 | |||
5537 | if (need_resched()) | 5533 | if (need_resched()) |
5538 | goto need_resched; | 5534 | goto need_resched; |
5539 | 5535 | ||