Merge branch 'wip-edf-wm' into wip-semi-part

This version of litmus2010 contains the implementation of three
semi-partitioned scheduling algorithms: EDF-fm, EDF-WM, and NPS-F.

Conflicts:
	include/litmus/rt_param.h
	litmus/Makefile

1 files changed, 3 insertions, 3 deletions

diff --git a/litmus/sched_edf_fm.c b/litmus/sched_edf_fm.c
index e14f8588c7a4..38b5a3f97101 100644
--- a/litmus/sched_edf_fm.c
+++ b/litmus/sched_edf_fm.c
@@ -60,8 +60,8 @@ DEFINE_PER_CPU(edffm_domain_t, edffm_domains);
 /* Get job number for current cpu */
 #define cur_cpu_job_no(t)       \
         ((tsk_rt(t)->task_params.cpu == edffm_params(t).cpus[0]) ? \
-                tsk_rt(t)->semi_part.fm.cpu_job_no[0] : \
-                tsk_rt(t)->semi_part.fm.cpu_job_no[1])
+                tsk_rt(t)->semi_part.cpu_job_no[0] : \
+                tsk_rt(t)->semi_part.cpu_job_no[1])
 /* What is the current cpu position in the array? */
 #define edffm_cpu_pos(cpu,t)    \
         ((cpu == edffm_params(t).cpus[0]) ? \
@@ -259,7 +259,7 @@ static void update_job_counter(struct task_struct *t)
 
         /* Which CPU counter should be incremented? */
         cpu_pos = edffm_cpu_pos(t->rt_param.task_params.cpu, t);
-        t->rt_param.semi_part.fm.cpu_job_no[cpu_pos]++;
+        t->rt_param.semi_part.cpu_job_no[cpu_pos]++;
 
         TRACE_TASK(t, "job_no = %d, cpu_job_no(pos %d) = %d, cpu %d\n",
                         t->rt_param.job_params.job_no, cpu_pos, cur_cpu_job_no(t),