diff options
| author | Christopher Kenna <cjk@cs.unc.edu> | 2012-12-03 14:44:24 -0500 |
|---|---|---|
| committer | Christopher Kenna <cjk@cs.unc.edu> | 2012-12-03 14:44:24 -0500 |
| commit | 5e03dba817124a8e1c96416c187e5ddc2c0d32a2 (patch) | |
| tree | a65306be82d7bc7e23ff60b4619abb22c499a3d0 | |
| parent | 63717f154cf5f3d40f393e7704d6e061b4cc9025 (diff) | |
| parent | 1281cd8055be5dd42778d0294cfccfcb477650ff (diff) | |
Merge branch 'litmus-rt-wip-mc' into odroidx-color
Conflicts:
litmus/dgl.c
| -rw-r--r-- | litmus/dgl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/litmus/dgl.c b/litmus/dgl.c index f4337a59957..f9cede7ef54 100644 --- a/litmus/dgl.c +++ b/litmus/dgl.c | |||
| @@ -80,9 +80,9 @@ static void print_queue(struct dgl *dgl, struct list_head *list) | |||
| 80 | list_for_each_entry(pos, list, list) { | 80 | list_for_each_entry(pos, list, list) { |
| 81 | greq = pos->greq; | 81 | greq = pos->greq; |
| 82 | sched_trace_log_message("(%s-%d:r%d-p%x-b%x)->", greq->task->comm, | 82 | sched_trace_log_message("(%s-%d:r%d-p%x-b%x)->", greq->task->comm, |
| 83 | greq->task->pid, pos->replicas, | 83 | greq->task->pid, pos->replicas, |
| 84 | greq->need_prio[0], | 84 | greq->need_prio[0], |
| 85 | greq->blocked[0]); | 85 | greq->blocked[0]); |
| 86 | } | 86 | } |
| 87 | sched_trace_log_message("\n"); | 87 | sched_trace_log_message("\n"); |
| 88 | } | 88 | } |