diff options
| author | Jonathan Herman <hermanjl@cs.unc.edu> | 2012-09-29 13:05:45 -0400 |
|---|---|---|
| committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2012-09-29 13:05:45 -0400 |
| commit | e9fc09f4bd2bae682cea6e7155aad1fe3f58e77b (patch) | |
| tree | 469975dd524354db3b36d51704f77ce728fc0189 /include | |
| parent | daf1e620bff2cb6d830ef66725369bba9c858f62 (diff) | |
Resolved merge bugs.
Diffstat (limited to 'include')
| -rw-r--r-- | include/litmus/sched_trace.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h index 0370cdc091aa..15909e530771 100644 --- a/include/litmus/sched_trace.h +++ b/include/litmus/sched_trace.h | |||
| @@ -298,7 +298,6 @@ feather_callback void do_sched_trace_task_tardy(unsigned long id, | |||
| 298 | do { \ | 298 | do { \ |
| 299 | SCHED_TRACE(SCHED_TRACE_BASE_ID + 12, \ | 299 | SCHED_TRACE(SCHED_TRACE_BASE_ID + 12, \ |
| 300 | do_sched_trace_task_tardy, t); \ | 300 | do_sched_trace_task_tardy, t); \ |
| 301 | trace_litmus_task_tardy(t); \ | ||
| 302 | } while (0) | 301 | } while (0) |
| 303 | 302 | ||
| 304 | #define QT_START lt_t _qt_start = litmus_clock() | 303 | #define QT_START lt_t _qt_start = litmus_clock() |