diff options
| author | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2008-07-01 10:12:30 -0400 |
|---|---|---|
| committer | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2008-07-01 10:12:30 -0400 |
| commit | 0291b7547359c8e01ca1146ca8f2d5f321338ff8 (patch) | |
| tree | fb6bc3688a9335e20e48cf57b7da8b0041e2db00 /include | |
| parent | 7364a4bcb88e6c1291a9a8af097a139e84eebace (diff) | |
compile without FMLP support if it is disabled
Diffstat (limited to 'include')
| -rw-r--r-- | include/litmus/sched_plugin.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/litmus/sched_plugin.h b/include/litmus/sched_plugin.h index 5b4b430a5b..c26af80da8 100644 --- a/include/litmus/sched_plugin.h +++ b/include/litmus/sched_plugin.h | |||
| @@ -88,7 +88,6 @@ struct sched_plugin { | |||
| 88 | /* basic info */ | 88 | /* basic info */ |
| 89 | char *plugin_name; | 89 | char *plugin_name; |
| 90 | unsigned int srp_active; | 90 | unsigned int srp_active; |
| 91 | unsigned int fmlp_active; | ||
| 92 | 91 | ||
| 93 | /* scheduler invocation */ | 92 | /* scheduler invocation */ |
| 94 | scheduler_tick_t tick; | 93 | scheduler_tick_t tick; |
| @@ -107,10 +106,13 @@ struct sched_plugin { | |||
| 107 | task_block_t task_block; | 106 | task_block_t task_block; |
| 108 | task_exit_t task_exit; | 107 | task_exit_t task_exit; |
| 109 | 108 | ||
| 109 | #ifdef CONFIG_FMLP | ||
| 110 | /* priority inheritance */ | 110 | /* priority inheritance */ |
| 111 | unsigned int fmlp_active; | ||
| 111 | inherit_priority_t inherit_priority; | 112 | inherit_priority_t inherit_priority; |
| 112 | return_priority_t return_priority; | 113 | return_priority_t return_priority; |
| 113 | pi_block_t pi_block; | 114 | pi_block_t pi_block; |
| 115 | #endif | ||
| 114 | } __attribute__ ((__aligned__(SMP_CACHE_BYTES))); | 116 | } __attribute__ ((__aligned__(SMP_CACHE_BYTES))); |
| 115 | 117 | ||
| 116 | 118 | ||
| @@ -124,10 +126,13 @@ static inline int srp_active(void) | |||
| 124 | { | 126 | { |
| 125 | return litmus->srp_active; | 127 | return litmus->srp_active; |
| 126 | } | 128 | } |
| 127 | |||
| 128 | static inline int fmlp_active(void) | 129 | static inline int fmlp_active(void) |
| 129 | { | 130 | { |
| 131 | #ifdef CONFIG_FMLP | ||
| 130 | return litmus->fmlp_active; | 132 | return litmus->fmlp_active; |
| 133 | #else | ||
| 134 | return 0; | ||
| 135 | #endif | ||
| 131 | } | 136 | } |
| 132 | 137 | ||
| 133 | #endif | 138 | #endif |
