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 /kernel | |
| parent | daf1e620bff2cb6d830ef66725369bba9c858f62 (diff) | |
Resolved merge bugs.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index d9d591e70b03..4f76f883f831 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -83,9 +83,6 @@ | |||
| 83 | #define CREATE_TRACE_POINTS | 83 | #define CREATE_TRACE_POINTS |
| 84 | #include <trace/events/sched.h> | 84 | #include <trace/events/sched.h> |
| 85 | 85 | ||
| 86 | #define CREATE_TRACE_POINTS | ||
| 87 | #include <trace/events/sched.h> | ||
| 88 | |||
| 89 | #include <litmus/sched_trace.h> | 86 | #include <litmus/sched_trace.h> |
| 90 | #include <litmus/trace.h> | 87 | #include <litmus/trace.h> |
| 91 | 88 | ||