compile without FMLP support if it is disabled

6 files changed, 48 insertions, 10 deletions

diff --git a/include/litmus/sched_plugin.h b/include/litmus/sched_plugin.h
index 5b4b430a5b..c26af80da8 100644
--- a/include/litmus/sched_plugin.h
+++ b/include/litmus/sched_plugin.h
@@ -88,7 +88,6 @@ struct sched_plugin {
         /*      basic info              */
         char                    *plugin_name;
         unsigned int            srp_active;
-        unsigned int            fmlp_active;
 
         /*      scheduler invocation    */
         scheduler_tick_t        tick;
@@ -107,10 +106,13 @@ struct sched_plugin {
         task_block_t            task_block;
         task_exit_t             task_exit;
 
+#ifdef CONFIG_FMLP
         /*     priority inheritance     */
+        unsigned int            fmlp_active;
         inherit_priority_t      inherit_priority;
         return_priority_t       return_priority;
         pi_block_t              pi_block;
+#endif
 } __attribute__ ((__aligned__(SMP_CACHE_BYTES)));
 
 
@@ -124,10 +126,13 @@ static inline int srp_active(void)
 {
         return litmus->srp_active;
 }
-
 static inline int fmlp_active(void)
 {
+#ifdef CONFIG_FMLP
         return litmus->fmlp_active;
+#else
+        return 0;
+#endif
 }
 
 #endif
diff --git a/litmus/fdso.c b/litmus/fdso.c
index 966b6e9e87..81ab0afff3 100644
--- a/litmus/fdso.c
+++ b/litmus/fdso.c
@@ -28,7 +28,10 @@ static const struct fdso_ops* fdso_ops[] = {
 
 static void* fdso_create(obj_type_t type)
 {
-        return fdso_ops[type]->create();
+        if (fdso_ops[type]->create)
+                return fdso_ops[type]->create();
+        else
+                return NULL;
 }
 
 static void fdso_destroy(obj_type_t type, void* obj)
diff --git a/litmus/fmlp.c b/litmus/fmlp.c
index 1c359c21c2..f34eeea9ab 100644
--- a/litmus/fmlp.c
+++ b/litmus/fmlp.c
@@ -16,9 +16,7 @@
 
 #include <litmus/trace.h>
 
-/* ************************************************************************** */
-/*                          PRIORITY INHERITANCE                              */
-/* ************************************************************************** */
+#ifdef CONFIG_FMLP
 
 static  void* create_fmlp_semaphore(void)
 {
@@ -128,7 +126,7 @@ int edf_set_hp_cpu_task(struct pi_semaphore *sem, int cpu)
         return ret;
 }
 
-int do_fmlp_down(struct pi_semaphore* sem)
+static int do_fmlp_down(struct pi_semaphore* sem)
 {
         unsigned long flags;
         struct task_struct *tsk = current;
@@ -187,7 +185,7 @@ int do_fmlp_down(struct pi_semaphore* sem)
         return suspended;
 }
 
-void do_fmlp_up(struct pi_semaphore* sem)
+static void do_fmlp_up(struct pi_semaphore* sem)
 {
         unsigned long flags;
 
@@ -246,3 +244,19 @@ asmlinkage long sys_fmlp_up(int sem_od)
 
         return ret;
 }
+
+#else
+
+struct fdso_ops fmlp_sem_ops = {};
+
+asmlinkage long sys_fmlp_down(int sem_od)
+{
+        return -ENOSYS;
+}
+
+asmlinkage long sys_fmlp_up(int sem_od)
+{
+        return -ENOSYS;
+}
+
+#endif
diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c
index 1d84591c9c..e32a4e8458 100644
--- a/litmus/sched_gsn_edf.c
+++ b/litmus/sched_gsn_edf.c
@@ -593,6 +593,7 @@ static void gsnedf_task_exit(struct task_struct * t)
         TRACE_TASK(t, "RIP\n");
 }
 
+#ifdef CONFIG_FMLP
 static long gsnedf_pi_block(struct pi_semaphore *sem,
                             struct task_struct *new_waiter)
 {
@@ -677,6 +678,8 @@ static long gsnedf_return_priority(struct pi_semaphore *sem)
         return ret;
 }
 
+#endif
+
 static long gsnedf_admit_task(struct task_struct* tsk)
 {
         return 0;
@@ -686,7 +689,6 @@ static long gsnedf_admit_task(struct task_struct* tsk)
 /*      Plugin object   */
 static struct sched_plugin gsn_edf_plugin __cacheline_aligned_in_smp = {
         .plugin_name            = "GSN-EDF",
-        .fmlp_active            = 1,
         .finish_switch          = gsnedf_finish_switch,
         .tick                   = gsnedf_tick,
         .task_new               = gsnedf_task_new,
@@ -695,9 +697,12 @@ static struct sched_plugin gsn_edf_plugin __cacheline_aligned_in_smp = {
         .schedule               = gsnedf_schedule,
         .task_wake_up           = gsnedf_task_wake_up,
         .task_block             = gsnedf_task_block,
+#ifdef CONFIG_FMLP
+        .fmlp_active            = 1,
         .pi_block               = gsnedf_pi_block,
         .inherit_priority       = gsnedf_inherit_priority,
         .return_priority        = gsnedf_return_priority,
+#endif
         .admit_task             = gsnedf_admit_task
 };
 
diff --git a/litmus/sched_plugin.c b/litmus/sched_plugin.c
index dbf709ee5e..497d703faa 100644
--- a/litmus/sched_plugin.c
+++ b/litmus/sched_plugin.c
@@ -57,6 +57,8 @@ static long litmus_dummy_complete_job(void)
         return -ENOSYS;
 }
 
+#ifdef CONFIG_FMLP
+
 static long litmus_dummy_inherit_priority(struct pi_semaphore *sem,
                                           struct task_struct *new_owner)
 {
@@ -74,6 +76,7 @@ static long litmus_dummy_pi_block(struct pi_semaphore *sem,
         return -ENOSYS;
 }
 
+#endif
 
 
 /* The default scheduler plugin. It doesn't do anything and lets Linux do its
@@ -89,9 +92,11 @@ struct sched_plugin linux_sched_plugin = {
         .complete_job = litmus_dummy_complete_job,
         .schedule = litmus_dummy_schedule,
         .finish_switch = litmus_dummy_finish_switch,
+#ifdef CONFIG_FMLP
         .inherit_priority = litmus_dummy_inherit_priority,
         .return_priority = litmus_dummy_return_priority,
         .pi_block = litmus_dummy_pi_block,
+#endif
         .admit_task = litmus_dummy_admit_task
 };
 
@@ -125,9 +130,11 @@ int register_sched_plugin(struct sched_plugin* plugin)
         CHECK(task_block);
         CHECK(task_new);
         CHECK(complete_job);
+#ifdef CONFIG_FMLP
         CHECK(inherit_priority);
         CHECK(return_priority);
         CHECK(pi_block);
+#endif
         CHECK(admit_task);
 
         if (!plugin->release_at)
diff --git a/litmus/sched_psn_edf.c b/litmus/sched_psn_edf.c
index 42b5665c44..50fc95d749 100644
--- a/litmus/sched_psn_edf.c
+++ b/litmus/sched_psn_edf.c
@@ -294,6 +294,7 @@ static void psnedf_task_exit(struct task_struct * t)
         spin_unlock_irqrestore(&pedf->slock, flags);
 }
 
+#ifdef CONFIG_FMLP
 static long psnedf_pi_block(struct pi_semaphore *sem,
                             struct task_struct *new_waiter)
 {
@@ -405,6 +406,7 @@ static long psnedf_return_priority(struct pi_semaphore *sem)
         return ret;
 }
 
+#endif
 
 static long psnedf_admit_task(struct task_struct* tsk)
 {
@@ -414,7 +416,6 @@ static long psnedf_admit_task(struct task_struct* tsk)
 /*      Plugin object   */
 static struct sched_plugin psn_edf_plugin __cacheline_aligned_in_smp = {
         .plugin_name            = "PSN-EDF",
-        .fmlp_active            = 1,
         .srp_active             = 1,
         .tick                   = psnedf_tick,
         .task_new               = psnedf_task_new,
@@ -423,9 +424,12 @@ static struct sched_plugin psn_edf_plugin __cacheline_aligned_in_smp = {
         .schedule               = psnedf_schedule,
         .task_wake_up           = psnedf_task_wake_up,
         .task_block             = psnedf_task_block,
+#ifdef CONFIG_FMLP
+        .fmlp_active            = 1,
         .pi_block               = psnedf_pi_block,
         .inherit_priority       = psnedf_inherit_priority,
         .return_priority        = psnedf_return_priority,
+#endif
         .admit_task             = psnedf_admit_task
 };