Remove norq delayed work support.

7 files changed, 1 insertions, 118 deletions

diff --git a/include/litmus/norqlock.h b/include/litmus/norqlock.h
deleted file mode 100644
index e4c1d06f51..0000000000
--- a/include/litmus/norqlock.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef NORQLOCK_H
-#define NORQLOCK_H
-
-typedef void (*work_t)(unsigned long arg);
-
-struct no_rqlock_work {
-        int                     active;
-        work_t                  work;
-        unsigned long           arg;
-        struct no_rqlock_work*  next;
-};
-
-void init_no_rqlock_work(struct no_rqlock_work* w, work_t work,
-                         unsigned long arg);
-
-void __do_without_rqlock(struct no_rqlock_work *work);
-
-static inline void do_without_rqlock(struct no_rqlock_work *work)
-{
-        if (!test_and_set_bit(0, (void*)&work->active))
-                __do_without_rqlock(work);
-}
-
-void tick_no_rqlock(void);
-
-#endif
diff --git a/include/litmus/rt_domain.h b/include/litmus/rt_domain.h
index ea9de020cc..c7c55bef3e 100644
--- a/include/litmus/rt_domain.h
+++ b/include/litmus/rt_domain.h
@@ -5,7 +5,6 @@
 #ifndef __UNC_RT_DOMAIN_H__
 #define __UNC_RT_DOMAIN_H__
 
-#include <litmus/norqlock.h>
 #include <litmus/heap.h>
 
 #define RELEASE_QUEUE_SLOTS 127 /* prime */
@@ -22,8 +21,6 @@ struct release_queue {
 };
 
 typedef struct _rt_domain {
-        struct no_rqlock_work           arm_timer;
-
         /* runnable rt tasks are in here */
         spinlock_t                      ready_lock;
         struct heap                     ready_queue;
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index 7b8576b6bd..26c0228ea9 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1314,9 +1314,6 @@ void hrtimer_run_queues(void)
                 run_hrtimer_queue(cpu_base, i);
 }
 
-/* FIXME: this won't be needed anymore once we port to Linux > 2.6.24 */
-void hrtimer_wakeup_hack(int onoff);
-
 /*
  * Sleep related functions:
  */
@@ -1328,9 +1325,7 @@ static enum hrtimer_restart hrtimer_wakeup(struct hrtimer *timer)
 
         t->task = NULL;
         if (task) {
-                hrtimer_wakeup_hack(1);
                 wake_up_process(task);
-                hrtimer_wakeup_hack(0);
         }
 
         return HRTIMER_NORESTART;
diff --git a/kernel/sched.c b/kernel/sched.c
index a3e4ad1b15..2d4e5172f6 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -70,8 +70,6 @@
 #include <litmus/sched_trace.h>
 #include <litmus/trace.h>
 
-#include <litmus/norqlock.h>
-
 /*
  * Scheduler clock - returns current time in nanosec units.
  * This is default implementation.
@@ -1663,7 +1661,6 @@ out:
         if (is_realtime(p))
                 TRACE_TASK(p, "try_to_wake_up() done state:%d\n", p->state);
         task_rq_unlock(rq, &flags);
-        tick_no_rqlock();
         return success;
 }
 
@@ -3705,8 +3702,6 @@ need_resched_nonpreemptible:
         }
         TS_SCHED2_START(current);
 
-        tick_no_rqlock();
-
         sched_trace_task_switch_to(current);
 
         if (unlikely(reacquire_kernel_lock(current) < 0)) {
diff --git a/litmus/Makefile b/litmus/Makefile
index b5ac4ca345..f7c7e02fd9 100644
--- a/litmus/Makefile
+++ b/litmus/Makefile
@@ -5,7 +5,7 @@
 obj-y     = sched_plugin.o litmus.o \
             edf_common.o jobs.o \
             rt_domain.o fdso.o sync.o \
-            fmlp.o srp.o norqlock.o \
+            fmlp.o srp.o \
             heap.o \
             sched_gsn_edf.o \
             sched_psn_edf.o \
diff --git a/litmus/norqlock.c b/litmus/norqlock.c
deleted file mode 100644
index 1a17d6c3ac..0000000000
--- a/litmus/norqlock.c
+++ /dev/null
@@ -1,76 +0,0 @@
-#include <linux/list.h>
-#include <linux/bitops.h>
-#include <linux/percpu.h>
-#include <linux/module.h>
-#include <linux/smp.h>
-
-#include <litmus/norqlock.h>
-
-struct worklist {
-        struct no_rqlock_work* next;
-        int hrtimer_hack;
-};
-
-static DEFINE_PER_CPU(struct worklist, norq_worklist) = {NULL, 0};
-
-void init_no_rqlock_work(struct no_rqlock_work* w, work_t work,
-                         unsigned long arg)
-{
-        w->active = 0;
-        w->work   = work;
-        w->arg    = arg;
-        w->next   = NULL;
-}
-
-void __do_without_rqlock(struct no_rqlock_work *work)
-{
-        long flags;
-        struct worklist* wl;
-
-        local_irq_save(flags);
-        wl = &__get_cpu_var(norq_worklist);
-        work->next = wl->next;
-        wl->next   = work;
-        local_irq_restore(flags);
-}
-
-void hrtimer_wakeup_hack(int onoff)
-{
-        preempt_disable();
-        __get_cpu_var(norq_worklist).hrtimer_hack = onoff;
-        preempt_enable();
-}
-
-void tick_no_rqlock(void)
-{
-        long flags;
-        struct no_rqlock_work *todo, *next;
-        struct worklist* wl;
-
-
-        local_irq_save(flags);
-
-        wl = &__get_cpu_var(norq_worklist);
-
-        if (wl->hrtimer_hack) {
-                /* bail out! */
-                local_irq_restore(flags);
-                return;
-        }
-
-        next = wl->next;
-        wl->next = NULL;
-
-        local_irq_restore(flags);
-
-        while (next) {
-                todo = next;
-                next = next->next;
-                todo->next = NULL;
-                smp_mb__before_clear_bit();
-                clear_bit(0, (void*) &todo->active);
-                todo->work(todo->arg);
-        }
-
-
-}
diff --git a/litmus/rt_domain.c b/litmus/rt_domain.c
index 2d0920ccad..ae7970ab09 100644
--- a/litmus/rt_domain.c
+++ b/litmus/rt_domain.c
@@ -262,7 +262,6 @@ void rt_domain_init(rt_domain_t *rt,
         rt->check_resched       = check;
         rt->release_jobs        = release;
         rt->order               = order;
-        init_no_rqlock_work(&rt->arm_timer, arm_release_timer, (unsigned long) rt);
 }
 
 /* add_ready - add a real-time task to the rt ready queue. It must be runnable.
@@ -297,6 +296,5 @@ void __add_release(rt_domain_t* rt, struct task_struct *task)
         TRACE_TASK(task, "add_release(), rel=%llu\n", get_release(task));
         list_add(&tsk_rt(task)->list, &rt->tobe_released);
         task->rt_param.domain = rt;
-        do_without_rqlock(&rt->arm_timer);
 }