1 files changed, 0 insertions, 126 deletions

diff --git a/litmus/sched_psn_edf.c b/litmus/sched_psn_edf.c
index c1e27960576b..fc64c1722ae9 100644
--- a/litmus/sched_psn_edf.c
+++ b/litmus/sched_psn_edf.c
@@ -309,132 +309,6 @@ static void psnedf_task_exit(struct task_struct * t)
         raw_spin_unlock_irqrestore(&pedf->slock, flags);
 }
 
-#if 0
-static long psnedf_pi_block(struct pi_semaphore *sem,
-                            struct task_struct *new_waiter)
-{
-        psnedf_domain_t*        pedf;
-        rt_domain_t*            edf;
-        struct task_struct*     t;
-        int cpu  = get_partition(new_waiter);
-
-        BUG_ON(!new_waiter);
-
-        if (edf_higher_prio(new_waiter, sem->hp.cpu_task[cpu])) {
-                TRACE_TASK(new_waiter, " boosts priority\n");
-                pedf = task_pedf(new_waiter);
-                edf  = task_edf(new_waiter);
-
-                /* interrupts already disabled */
-                raw_spin_lock(&pedf->slock);
-
-                /* store new highest-priority task */
-                sem->hp.cpu_task[cpu] = new_waiter;
-                if (sem->holder &&
-                    get_partition(sem->holder) == get_partition(new_waiter)) {
-                        /* let holder inherit */
-                        sem->holder->rt_param.inh_task = new_waiter;
-                        t = sem->holder;
-                        if (is_queued(t)) {
-                                /* queued in domain*/
-                                remove(edf, t);
-                                /* readd to make priority change take place */
-                                /* FIXME: this looks outdated */
-                                if (is_released(t, litmus_clock()))
-                                        __add_ready(edf, t);
-                                else
-                                        add_release(edf, t);
-                        }
-                }
-
-                /* check if we need to reschedule */
-                if (edf_preemption_needed(edf, current))
-                        preempt(pedf);
-
-                raw_spin_unlock(&pedf->slock);
-        }
-
-        return 0;
-}
-
-static long psnedf_inherit_priority(struct pi_semaphore *sem,
-                                    struct task_struct *new_owner)
-{
-        int cpu  = get_partition(new_owner);
-
-        new_owner->rt_param.inh_task = sem->hp.cpu_task[cpu];
-        if (sem->hp.cpu_task[cpu] && new_owner != sem->hp.cpu_task[cpu]) {
-                TRACE_TASK(new_owner,
-                           "inherited priority from %s/%d\n",
-                           sem->hp.cpu_task[cpu]->comm,
-                           sem->hp.cpu_task[cpu]->pid);
-        } else
-                TRACE_TASK(new_owner,
-                           "cannot inherit priority: "
-                           "no higher priority job waits on this CPU!\n");
-        /* make new owner non-preemptable as required by FMLP under
-         * PSN-EDF.
-         */
-        make_np(new_owner);
-        return 0;
-}
-
-
-/* This function is called on a semaphore release, and assumes that
- * the current task is also the semaphore holder.
- */
-static long psnedf_return_priority(struct pi_semaphore *sem)
-{
-        struct task_struct*     t    = current;
-        psnedf_domain_t*        pedf = task_pedf(t);
-        rt_domain_t*            edf  = task_edf(t);
-        int                     ret  = 0;
-        int                     cpu  = get_partition(current);
-        int still_np;
-
-
-        /* Find new highest-priority semaphore task
-         * if holder task is the current hp.cpu_task[cpu].
-         *
-         * Calling function holds sem->wait.lock.
-         */
-        if (t == sem->hp.cpu_task[cpu])
-                edf_set_hp_cpu_task(sem, cpu);
-
-        still_np = take_np(current);
-
-        /* Since we don't nest resources, this
-         * should always be zero */
-        BUG_ON(still_np);
-
-        if (current->rt_param.inh_task) {
-                TRACE_CUR("return priority of %s/%d\n",
-                          current->rt_param.inh_task->comm,
-                          current->rt_param.inh_task->pid);
-        } else
-                TRACE_CUR(" no priority to return %p\n", sem);
-
-
-        /* Always check for delayed preemptions that might have become
-         * necessary due to non-preemptive execution.
-         */
-        raw_spin_lock(&pedf->slock);
-
-        /* Reset inh_task to NULL. */
-        current->rt_param.inh_task = NULL;
-
-        /* check if we need to reschedule */
-        if (edf_preemption_needed(edf, current))
-                preempt(pedf);
-
-        raw_spin_unlock(&pedf->slock);
-
-
-        return ret;
-}
-
-#endif
-
 #ifdef CONFIG_LITMUS_LOCKING
 
 #include <litmus/fdso.h>