diff options
author | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2007-10-04 21:42:38 -0400 |
---|---|---|
committer | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2007-10-04 21:42:38 -0400 |
commit | ffdf0e8b1c67171d3dd170a924afdf39a55811a8 (patch) | |
tree | 4c67f9ee0d8f7914d947dd348c3a38d672d23907 /kernel | |
parent | a9ae5eeea150f11e83035aa92bbf73274e68f8d2 (diff) |
Fix RT scheduler tick
Update adaptive plugin initialization.
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/sched_adaptive.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/sched_adaptive.c b/kernel/sched_adaptive.c index f31450eaaa..520a290be6 100644 --- a/kernel/sched_adaptive.c +++ b/kernel/sched_adaptive.c | |||
@@ -395,7 +395,6 @@ static noinline void job_completion(struct task_struct *t) | |||
395 | * The following assertions for the scheduled task could hold: | 395 | * The following assertions for the scheduled task could hold: |
396 | * | 396 | * |
397 | * - !is_running(scheduled) // the job blocks | 397 | * - !is_running(scheduled) // the job blocks |
398 | * - scheduled->timeslice == 0 // the job completed (forcefully) | ||
399 | * - get_rt_flag() == RT_F_SLEEP // the job completed (by syscall) | 398 | * - get_rt_flag() == RT_F_SLEEP // the job completed (by syscall) |
400 | * - linked != scheduled // we need to reschedule (for any reason) | 399 | * - linked != scheduled // we need to reschedule (for any reason) |
401 | * - is_np(scheduled) // rescheduling must be delayed, | 400 | * - is_np(scheduled) // rescheduling must be delayed, |
@@ -755,8 +754,7 @@ static sched_plugin_t s_plugin __cacheline_aligned_in_smp = { | |||
755 | #define INIT_SCHED_PLUGIN (struct sched_plugin){ \ | 754 | #define INIT_SCHED_PLUGIN (struct sched_plugin){ \ |
756 | .plugin_name = "ADAPTIVE", \ | 755 | .plugin_name = "ADAPTIVE", \ |
757 | .ready_to_use = 1, \ | 756 | .ready_to_use = 1, \ |
758 | .algo_scheduler_tick = adaptive_scheduler_tick, \ | 757 | .scheduler_tick = adaptive_scheduler_tick, \ |
759 | .scheduler_tick = rt_scheduler_tick, \ | ||
760 | .prepare_task = adaptive_prepare_task, \ | 758 | .prepare_task = adaptive_prepare_task, \ |
761 | .sleep_next_period = edf_sleep_next_period, \ | 759 | .sleep_next_period = edf_sleep_next_period, \ |
762 | .tear_down = adaptive_tear_down, \ | 760 | .tear_down = adaptive_tear_down, \ |