diff options
Diffstat (limited to 'litmus/sched_litmus.c')
-rw-r--r-- | litmus/sched_litmus.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/litmus/sched_litmus.c b/litmus/sched_litmus.c index 1bca2e1a33cd..9a6fe487718e 100644 --- a/litmus/sched_litmus.c +++ b/litmus/sched_litmus.c | |||
@@ -254,12 +254,12 @@ static void task_tick_litmus(struct rq *rq, struct task_struct *p, int queued) | |||
254 | return; | 254 | return; |
255 | } | 255 | } |
256 | 256 | ||
257 | static void switched_to_litmus(struct rq *rq, struct task_struct *p, int running) | 257 | static void switched_to_litmus(struct rq *rq, struct task_struct *p) |
258 | { | 258 | { |
259 | } | 259 | } |
260 | 260 | ||
261 | static void prio_changed_litmus(struct rq *rq, struct task_struct *p, | 261 | static void prio_changed_litmus(struct rq *rq, struct task_struct *p, |
262 | int oldprio, int running) | 262 | int oldprio) |
263 | { | 263 | { |
264 | } | 264 | } |
265 | 265 | ||
@@ -285,8 +285,8 @@ static void set_curr_task_litmus(struct rq *rq) | |||
285 | * We don't care about the scheduling domain; can gets called from | 285 | * We don't care about the scheduling domain; can gets called from |
286 | * exec, fork, wakeup. | 286 | * exec, fork, wakeup. |
287 | */ | 287 | */ |
288 | static int select_task_rq_litmus(struct rq *rq, struct task_struct *p, | 288 | static int |
289 | int sd_flag, int flags) | 289 | select_task_rq_litmus(struct task_struct *p, int sd_flag, int flags) |
290 | { | 290 | { |
291 | /* preemption is already disabled. | 291 | /* preemption is already disabled. |
292 | * We don't want to change cpu here | 292 | * We don't want to change cpu here |
@@ -296,7 +296,12 @@ static int select_task_rq_litmus(struct rq *rq, struct task_struct *p, | |||
296 | #endif | 296 | #endif |
297 | 297 | ||
298 | static const struct sched_class litmus_sched_class = { | 298 | static const struct sched_class litmus_sched_class = { |
299 | .next = &rt_sched_class, | 299 | /* From 34f971f6 the stop/migrate worker threads have a class on |
300 | * their own, which is the highest prio class. We don't support | ||
301 | * cpu-hotplug or cpu throttling. Allows Litmus to use up to 1.0 | ||
302 | * CPU capacity. | ||
303 | */ | ||
304 | .next = &stop_sched_class, | ||
300 | .enqueue_task = enqueue_task_litmus, | 305 | .enqueue_task = enqueue_task_litmus, |
301 | .dequeue_task = dequeue_task_litmus, | 306 | .dequeue_task = dequeue_task_litmus, |
302 | .yield_task = yield_task_litmus, | 307 | .yield_task = yield_task_litmus, |