diff options
| author | Jonathan Herman <hermanjl@cs.unc.edu> | 2012-11-15 15:41:54 -0500 |
|---|---|---|
| committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-04-16 23:06:07 -0400 |
| commit | 5848abe61548e8f5f4a98faf5364207fcb514545 (patch) | |
| tree | 6a51ca5ad3b3383eed2432e783a2a83eb07f4496 /litmus | |
| parent | 7b28f49b60e39d44decba6e4018cb3f021355c69 (diff) | |
Merged with latest kernelshark branch.
Conflicts:
include/litmus/sched_trace.h
include/trace/events/litmus.h
Diffstat (limited to 'litmus')
| -rw-r--r-- | litmus/litmus.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/litmus/litmus.c b/litmus/litmus.c index 3516463663bc..dc94be71bfb6 100644 --- a/litmus/litmus.c +++ b/litmus/litmus.c | |||
| @@ -384,8 +384,6 @@ void litmus_exit_task(struct task_struct* tsk) | |||
| 384 | { | 384 | { |
| 385 | if (is_realtime(tsk)) { | 385 | if (is_realtime(tsk)) { |
| 386 | sched_trace_task_completion(tsk, 1); | 386 | sched_trace_task_completion(tsk, 1); |
| 387 | sched_trace_task_exit(tsk); | ||
| 388 | sched_trace_task_tardy(tsk); | ||
| 389 | 387 | ||
| 390 | litmus->task_exit(tsk); | 388 | litmus->task_exit(tsk); |
| 391 | 389 | ||