diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /include/litmus/preempt.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'include/litmus/preempt.h')
| -rw-r--r-- | include/litmus/preempt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/litmus/preempt.h b/include/litmus/preempt.h index 260c6fe17986..380b886d78ff 100644 --- a/include/litmus/preempt.h +++ b/include/litmus/preempt.h | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | 10 | ||
| 11 | extern DEFINE_PER_CPU_SHARED_ALIGNED(atomic_t, resched_state); | 11 | extern DEFINE_PER_CPU_SHARED_ALIGNED(atomic_t, resched_state); |
| 12 | 12 | ||
| 13 | #ifdef CONFIG_DEBUG_KERNEL | 13 | #ifdef CONFIG_PREEMPT_STATE_TRACE |
| 14 | const char* sched_state_name(int s); | 14 | const char* sched_state_name(int s); |
| 15 | #define TRACE_STATE(fmt, args...) TRACE("SCHED_STATE " fmt, args) | 15 | #define TRACE_STATE(fmt, args...) TRACE("SCHED_STATE " fmt, args) |
| 16 | #else | 16 | #else |