Merge branch 'wip-gpu-cleanup' into wip-2012.3-gpu

Conflicts:
	include/litmus/fpmath.h
	include/litmus/litmus.h
	include/litmus/rt_param.h
	include/litmus/trace.h
	kernel/sched.c
	kernel/softirq.c
	litmus/edf_common.c
	litmus/jobs.c
	litmus/litmus.c
	litmus/locking.c
	litmus/preempt.c
	litmus/sched_cedf.c
	litmus/sched_gsn_edf.c
	litmus/sched_litmus.c
	litmus/sync.c

1 files changed, 78 insertions, 2 deletions

diff --git a/include/litmus/sched_plugin.h b/include/litmus/sched_plugin.h
index 1546ab7f1d66..d0e7d74bb45e 100644
--- a/include/litmus/sched_plugin.h
+++ b/include/litmus/sched_plugin.h
@@ -11,6 +11,12 @@
 #include <litmus/locking.h>
 #endif
 
+#ifdef CONFIG_LITMUS_AFFINITY_LOCKING
+#include <litmus/kexclu_affinity.h>
+#endif
+
+#include <linux/interrupt.h>
+
 /************************ setup/tear down ********************/
 
 typedef long (*activate_plugin_t) (void);
@@ -29,7 +35,6 @@ typedef struct task_struct* (*schedule_t)(struct task_struct * prev);
  */
 typedef void (*finish_switch_t)(struct task_struct *prev);
 
-
 /********************* task state changes ********************/
 
 /* Called to setup a new real-time task.
@@ -60,6 +65,49 @@ typedef long (*allocate_lock_t) (struct litmus_lock **lock, int type,
                                  void* __user config);
 #endif
 
+struct affinity_observer;
+typedef long (*allocate_affinity_observer_t) (
+                                                                struct affinity_observer **aff_obs, int type,
+                                                                void* __user config);
+
+typedef void (*increase_prio_t)(struct task_struct* t, struct task_struct* prio_inh);
+typedef void (*decrease_prio_t)(struct task_struct* t, struct task_struct* prio_inh);
+
+typedef int (*__increase_prio_t)(struct task_struct* t, struct task_struct* prio_inh);
+typedef int (*__decrease_prio_t)(struct task_struct* t, struct task_struct* prio_inh);
+
+typedef void (*nested_increase_prio_t)(struct task_struct* t, struct task_struct* prio_inh,
+                                                                          raw_spinlock_t *to_unlock, unsigned long irqflags);
+typedef void (*nested_decrease_prio_t)(struct task_struct* t, struct task_struct* prio_inh,
+                                                                          raw_spinlock_t *to_unlock, unsigned long irqflags);
+
+
+typedef int (*enqueue_pai_tasklet_t)(struct tasklet_struct* tasklet);
+typedef void (*change_prio_pai_tasklet_t)(struct task_struct *old_prio,
+                                                                                  struct task_struct *new_prio);
+typedef void (*run_tasklets_t)(struct task_struct* next);
+
+typedef raw_spinlock_t* (*get_dgl_spinlock_t) (struct task_struct *t);
+
+
+typedef int (*higher_prio_t)(struct task_struct* a, struct task_struct* b);
+
+#ifdef CONFIG_LITMUS_NESTED_LOCKING
+
+typedef enum
+{
+        BASE,
+        EFFECTIVE
+} comparison_mode_t;
+
+typedef int (*__higher_prio_t)(struct task_struct* a, comparison_mode_t a_mod,
+                                                          struct task_struct* b, comparison_mode_t b_mod);
+#endif
+
+#if defined(CONFIG_LITMUS_NVIDIA) && defined(CONFIG_LITMUS_SOFTIRQD)
+typedef int (*default_cpu_for_gpu_t)(int gpu);
+#endif
+
 
 /********************* sys call backends  ********************/
 /* This function causes the caller to sleep until the next release */
@@ -90,14 +138,42 @@ struct sched_plugin {
         /*      task state changes      */
         admit_task_t            admit_task;
 
-        task_new_t              task_new;
+    task_new_t                  task_new;
         task_wake_up_t          task_wake_up;
         task_block_t            task_block;
         task_exit_t             task_exit;
 
+        higher_prio_t           compare;
+
 #ifdef CONFIG_LITMUS_LOCKING
         /*      locking protocols       */
         allocate_lock_t         allocate_lock;
+        increase_prio_t         increase_prio;
+        decrease_prio_t         decrease_prio;
+
+        __increase_prio_t       __increase_prio;
+        __decrease_prio_t       __decrease_prio;
+#endif
+#ifdef CONFIG_LITMUS_NESTED_LOCKING
+        nested_increase_prio_t nested_increase_prio;
+        nested_decrease_prio_t nested_decrease_prio;
+        __higher_prio_t         __compare;
+#endif
+#ifdef CONFIG_LITMUS_DGL_SUPPORT
+        get_dgl_spinlock_t      get_dgl_spinlock;
+#endif
+
+#ifdef CONFIG_LITMUS_AFFINITY_LOCKING
+        allocate_affinity_observer_t allocate_aff_obs;
+#endif
+#ifdef CONFIG_LITMUS_PAI_SOFTIRQD
+        enqueue_pai_tasklet_t           enqueue_pai_tasklet;
+        change_prio_pai_tasklet_t       change_prio_pai_tasklet;
+        run_tasklets_t                          run_tasklets;
+#endif
+
+#if defined(CONFIG_LITMUS_NVIDIA) && defined(CONFIG_LITMUS_SOFTIRQD)
+        default_cpu_for_gpu_t           map_gpu_to_cpu;
 #endif
 } __attribute__ ((__aligned__(SMP_CACHE_BYTES)));