Remove all #ifdef FMLP sections

1 files changed, 0 insertions, 162 deletions

diff --git a/litmus/sched_mcrit.c b/litmus/sched_mcrit.c
index 40c5a95457b7..0d26b3b158da 100644
--- a/litmus/sched_mcrit.c
+++ b/litmus/sched_mcrit.c
@@ -646,162 +646,6 @@ static void mcrit_task_exit(struct task_struct * t)
         TRACE_TASK(t, "RIP\n");
 }
 
-#ifdef CONFIG_FMLP
-
-/* Update the queue position of a task that got it's priority boosted via
- * priority inheritance. */
-static void update_queue_position(struct task_struct *holder)
-{
-        /* We don't know whether holder is in the ready queue. It should, but
-         * on a budget overrun it may already be in a release queue.  Hence,
-         * calling unlink() is not possible since it assumes that the task is
-         * not in a release queue.  However, we can safely check whether
-         * sem->holder is currently in a queue or scheduled after locking both
-         * the release and the ready queue lock. */
-
-        /* Assumption: caller holds mcrit_lock */
-
-        int check_preempt = 0;
-
-        if (tsk_rt(holder)->linked_on != NO_CPU) {
-                TRACE_TASK(holder, "%s: linked  on %d\n",
-                           __FUNCTION__, tsk_rt(holder)->linked_on);
-                /* Holder is scheduled; need to re-order CPUs.
-                 * We can't use heap_decrease() here since
-                 * the cpu_heap is ordered in reverse direction, so
-                 * it is actually an increase. */
-                bheap_delete(cpu_lower_prio, &mcrit_cpu_heap,
-                            mcrit_cpus[tsk_rt(holder)->linked_on]->hn);
-                bheap_insert(cpu_lower_prio, &mcrit_cpu_heap,
-                            mcrit_cpus[tsk_rt(holder)->linked_on]->hn);
-        } else {
-                /* holder may be queued: first stop queue changes */
-                raw_spin_lock(&mcrit.release_lock);
-                if (is_queued(holder)) {
-                        TRACE_TASK(holder, "%s: is queued\n",
-                                   __FUNCTION__);
-                        /* We need to update the position
-                         * of holder in some heap. Note that this
-                         * may be a release heap. */
-                        check_preempt =
-                                !bheap_decrease(mcrit_edf_ready_order,
-                                               tsk_rt(holder)->heap_node);
-                } else {
-                        /* Nothing to do: if it is not queued and not linked
-                         * then it is currently being moved by other code
-                         * (e.g., a timer interrupt handler) that will use the
-                         * correct priority when enqueuing the task. */
-                        TRACE_TASK(holder, "%s: is NOT queued => Done.\n",
-                                   __FUNCTION__);
-                }
-                raw_spin_unlock(&mcrit.release_lock);
-
-                /* If holder was enqueued in a release heap, then the following
-                 * preemption check is pointless, but we can't easily detect
-                 * that case. If you want to fix this, then consider that
-                 * simply adding a state flag requires O(n) time to update when
-                 * releasing n tasks, which conflicts with the goal to have
-                 * O(log n) merges. */
-                if (check_preempt) {
-                        /* heap_decrease() hit the top level of the heap: make
-                         * sure preemption checks get the right task, not the
-                         * potentially stale cache. */
-                        bheap_uncache_min(mcrit_edf_ready_order,
-                                         &mcrit.ready_queue);
-                        check_for_preemptions();
-                }
-        }
-}
-
-static long mcrit_pi_block(struct pi_semaphore *sem,
-                            struct task_struct *new_waiter)
-{
-        /* This callback has to handle the situation where a new waiter is
-         * added to the wait queue of the semaphore.
-         *
-         * We must check if has a higher priority than the currently
-         * highest-priority task, and then potentially reschedule.
-         */
-
-        BUG_ON(!new_waiter);
-
-        if (mcrit_edf_higher_prio(new_waiter, sem->hp.task)) {
-                TRACE_TASK(new_waiter, " boosts priority via %p\n", sem);
-                /* called with IRQs disabled */
-                raw_spin_lock(&mcrit_lock);
-                /* store new highest-priority task */
-                sem->hp.task = new_waiter;
-                if (sem->holder) {
-                        TRACE_TASK(sem->holder,
-                                   " holds %p and will inherit from %s/%d\n",
-                                   sem,
-                                   new_waiter->comm, new_waiter->pid);
-                        /* let holder inherit */
-                        sem->holder->rt_param.inh_task = new_waiter;
-                        update_queue_position(sem->holder);
-                }
-                raw_spin_unlock(&mcrit_lock);
-        }
-
-        return 0;
-}
-
-static long mcrit_inherit_priority(struct pi_semaphore *sem,
-                                    struct task_struct *new_owner)
-{
-        /* We don't need to acquire the mcrit_lock since at the time of this
-         * call new_owner isn't actually scheduled yet (it's still sleeping)
-         * and since the calling function already holds sem->wait.lock, which
-         * prevents concurrent sem->hp.task changes.
-         */
-
-        if (sem->hp.task && sem->hp.task != new_owner) {
-                new_owner->rt_param.inh_task = sem->hp.task;
-                TRACE_TASK(new_owner, "inherited priority from %s/%d\n",
-                           sem->hp.task->comm, sem->hp.task->pid);
-        } else
-                TRACE_TASK(new_owner,
-                           "cannot inherit priority, "
-                           "no higher priority job waits.\n");
-        return 0;
-}
-
-/* This function is called on a semaphore release, and assumes that
- * the current task is also the semaphore holder.
- */
-static long mcrit_return_priority(struct pi_semaphore *sem)
-{
-        struct task_struct* t = current;
-        int ret = 0;
-
-        /* Find new highest-priority semaphore task
-         * if holder task is the current hp.task.
-         *
-         * Calling function holds sem->wait.lock.
-         */
-        if (t == sem->hp.task)
-                edf_set_hp_task(sem);
-
-        TRACE_CUR("mcrit_return_priority for lock %p\n", sem);
-
-        if (t->rt_param.inh_task) {
-                /* interrupts already disabled by PI code */
-                raw_spin_lock(&mcrit_lock);
-
-                /* Reset inh_task to NULL. */
-                t->rt_param.inh_task = NULL;
-
-                /* Check if rescheduling is necessary */
-                unlink(t);
-                mcrit_job_arrival(t);
-                raw_spin_unlock(&mcrit_lock);
-        }
-
-        return ret;
-}
-
-#endif
-
 static long mcrit_admit_task(struct task_struct* tsk)
 {
         return 0;
@@ -848,12 +692,6 @@ static struct sched_plugin m_crit_plugin __cacheline_aligned_in_smp = {
         .schedule               = mcrit_schedule,
         .task_wake_up           = mcrit_task_wake_up,
         .task_block             = mcrit_task_block,
-#ifdef CONFIG_FMLP
-        .fmlp_active            = 1,
-        .pi_block               = mcrit_pi_block,
-        .inherit_priority       = mcrit_inherit_priority,
-        .return_priority        = mcrit_return_priority,
-#endif
         .admit_task             = mcrit_admit_task,
         .activate_plugin        = mcrit_activate_plugin,
 };