Fix partition handling of PSN-EDF.

1 files changed, 12 insertions, 8 deletions

diff --git a/kernel/sched_psn_edf.c b/kernel/sched_psn_edf.c
index ad28d07c62..8c3c2d81b5 100644
--- a/kernel/sched_psn_edf.c
+++ b/kernel/sched_psn_edf.c
@@ -356,7 +356,7 @@ static long psnedf_pi_block(struct pi_semaphore *sem,
         psnedf_domain_t*        pedf; 
         edf_domain_t*           edf;
         struct task_struct*     t;
-        int cpu  = smp_processor_id();
+        int cpu  = get_partition(new_waiter);
 
         BUG_ON(!new_waiter);    
 
@@ -399,7 +399,7 @@ static long psnedf_pi_block(struct pi_semaphore *sem,
 static long psnedf_inherit_priority(struct pi_semaphore *sem,
                                     struct task_struct *new_owner)
 {
-        int cpu  = smp_processor_id();
+        int cpu  = get_partition(new_owner);
 
         new_owner->rt_param.inh_task = sem->hp.cpu_task[cpu];   
         if (sem->hp.cpu_task[cpu] && new_owner != sem->hp.cpu_task[cpu]) {
@@ -424,11 +424,11 @@ static long psnedf_inherit_priority(struct pi_semaphore *sem,
  */
 static long psnedf_return_priority(struct pi_semaphore *sem)
 {
-        psnedf_domain_t*        pedf = task_pedf(current);
-        edf_domain_t*           edf  = task_edf(current);
         struct task_struct*     t    = current;
+        psnedf_domain_t*        pedf = task_pedf(t);
+        edf_domain_t*           edf  = task_edf(t);
         int                     ret  = 0;
-        int                     cpu  = smp_processor_id();
+        int                     cpu  = get_partition(current);
 
 
         /* Find new highest-priority semaphore task
@@ -439,9 +439,11 @@ static long psnedf_return_priority(struct pi_semaphore *sem)
         if (t == sem->hp.cpu_task[cpu])
                 edf_set_hp_cpu_task(sem, cpu);
 
-        psnedf_exit_np(current);
-        TRACE_CUR("psnedf_return_priority for lock %p\n", sem);
+        psnedf_exit_np(t);      
         if (current->rt_param.inh_task) {
+                TRACE_CUR("return priority of %s/%d\n", 
+                          current->rt_param.inh_task->comm,
+                          current->rt_param.inh_task->pid);
                 spin_lock(&pedf->lock);
 
                 /* Reset inh_task to NULL. */
@@ -452,7 +454,9 @@ static long psnedf_return_priority(struct pi_semaphore *sem)
                         preempt(pedf);
 
                 spin_unlock(&pedf->lock);
-        }
+        } else
+                TRACE_CUR(" no priority to return %p\n", sem);
+
         return ret;
 }