diff options
Diffstat (limited to 'litmus/sched_psn_edf.c')
-rw-r--r-- | litmus/sched_psn_edf.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/litmus/sched_psn_edf.c b/litmus/sched_psn_edf.c index b89823d5c026..01f31e407082 100644 --- a/litmus/sched_psn_edf.c +++ b/litmus/sched_psn_edf.c | |||
@@ -309,7 +309,7 @@ static void psnedf_task_exit(struct task_struct * t) | |||
309 | raw_spin_unlock_irqrestore(&pedf->slock, flags); | 309 | raw_spin_unlock_irqrestore(&pedf->slock, flags); |
310 | } | 310 | } |
311 | 311 | ||
312 | #ifdef CONFIG_FMLP | 312 | #if 0 |
313 | static long psnedf_pi_block(struct pi_semaphore *sem, | 313 | static long psnedf_pi_block(struct pi_semaphore *sem, |
314 | struct task_struct *new_waiter) | 314 | struct task_struct *new_waiter) |
315 | { | 315 | { |
@@ -443,9 +443,6 @@ static long psnedf_admit_task(struct task_struct* tsk) | |||
443 | /* Plugin object */ | 443 | /* Plugin object */ |
444 | static struct sched_plugin psn_edf_plugin __cacheline_aligned_in_smp = { | 444 | static struct sched_plugin psn_edf_plugin __cacheline_aligned_in_smp = { |
445 | .plugin_name = "PSN-EDF", | 445 | .plugin_name = "PSN-EDF", |
446 | #ifdef CONFIG_SRP | ||
447 | .srp_active = 1, | ||
448 | #endif | ||
449 | .tick = psnedf_tick, | 446 | .tick = psnedf_tick, |
450 | .task_new = psnedf_task_new, | 447 | .task_new = psnedf_task_new, |
451 | .complete_job = complete_job, | 448 | .complete_job = complete_job, |
@@ -453,12 +450,6 @@ static struct sched_plugin psn_edf_plugin __cacheline_aligned_in_smp = { | |||
453 | .schedule = psnedf_schedule, | 450 | .schedule = psnedf_schedule, |
454 | .task_wake_up = psnedf_task_wake_up, | 451 | .task_wake_up = psnedf_task_wake_up, |
455 | .task_block = psnedf_task_block, | 452 | .task_block = psnedf_task_block, |
456 | #ifdef CONFIG_FMLP | ||
457 | .fmlp_active = 1, | ||
458 | .pi_block = psnedf_pi_block, | ||
459 | .inherit_priority = psnedf_inherit_priority, | ||
460 | .return_priority = psnedf_return_priority, | ||
461 | #endif | ||
462 | .admit_task = psnedf_admit_task | 453 | .admit_task = psnedf_admit_task |
463 | }; | 454 | }; |
464 | 455 | ||