Trying to push to repository again

3 files changed, 6 insertions, 7 deletions

diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
index 5291b703ed3f..e6cb57406270 100644
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@ -19,7 +19,7 @@
  * This may need to be greater than __NR_last_syscall+1 in order to
  * account for the padding in the syscall table
  */
-#define __NR_syscalls  (388 + NR_litmus_syscalls + 0)
+#define __NR_syscalls  (392 + NR_litmus_syscalls + 0)
 
 
 /*
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 18b9df47fb9d..468182ecde8e 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -121,9 +121,6 @@ struct reservation_config {
         
         //Need to inform which mode reservation belongs to in mc2
         int mode;
-        //convenient to have a line to the owning task for a
-        //reservation
-        struct task_struct *tsk;
 };
 
 /* regular sporadic task support */
diff --git a/litmus/sched_mc2.c b/litmus/sched_mc2.c
index 31d3019d9fce..ee04315c44a0 100644
--- a/litmus/sched_mc2.c
+++ b/litmus/sched_mc2.c
@@ -131,8 +131,10 @@ asmlinkage int sys_enact_mode(void)
                         && !res_reported){ //and C is throttled
                         mode = requested_mode;
                         _global_env = &_global_env_modes[mode];
+                        //set res->reported for new global tasks
                         list_for_each(pos, &_global_env->active_reservations){
                                 res = list_entry(pos, struct reservation, list);
+                                
                                 res->reported = 0;
                         }
                         list_for_each(pos, &_global_env->depleted_reservations){
@@ -142,6 +144,7 @@ asmlinkage int sys_enact_mode(void)
                         list_for_each(pos, &_global_env->inactive_reservations){
                                 res = list_entry(pos, struct reservation, list);
                                 res->reported = 0;
+                                res->env->change_state(res->env, res, RESERVATION_ACTIVE);
                         }
                         //gmp_update_time(_global_env, now);            
                 }
@@ -1609,7 +1612,7 @@ static long create_polling_reservation(
         
 
         pres->res.reported = 0;
-        pres->res.tsk = config->tsk;
+        pres->res.tsk = current;
 
         if (err < 0)
                 kfree(pres);
@@ -1726,7 +1729,7 @@ static long create_table_driven_reservation(
         }
 
         td_res->res.reported = 0;
-        td_res->res.tsk = config->tsk;
+        td_res->res.tsk = current;
         
         if (err < 0) {
                 kfree(slots);
@@ -1858,7 +1861,6 @@ static long mc2_activate_plugin(void)
 
         mode = 0;
         requested_mode = 0;
-        raw_spinlock_t mode_lock;
 
         for(i = 0; i < NR_MODES; i++){
                 mode_sizes[i] = 0;