Fixed some race conditions in the priority inheritance code, and fixed a

glitch or two in GSN-EDF.

1 files changed, 4 insertions, 7 deletions

diff --git a/arch/i386/kernel/pi_sem_syscalls.c b/arch/i386/kernel/pi_sem_syscalls.c
index ad0df7add0..8071b0fe46 100644
--- a/arch/i386/kernel/pi_sem_syscalls.c
+++ b/arch/i386/kernel/pi_sem_syscalls.c
@@ -81,13 +81,10 @@ asmlinkage long sys_pi_down(pi_sema_id sem_id)
 
         /* Update inherited priority if required. */
         spin_lock_irqsave(&pi_sems[sem_id].wait.lock, flags);
-        if (!current->rt_param.inh_task) {
-                pi_sems[sem_id].holder = current;
-                current->rt_param.inh_task = current;
-                if (pi_sems[sem_id].hp_sem_task)
-                        curr_sched_plugin->inherit_priority(
-                                &pi_sems[sem_id], pi_sems[sem_id].hp_sem_task);
-        }       
+        if (!pi_sems[sem_id].holder) {
+               pi_sems[sem_id].holder = current;
+               curr_sched_plugin->inherit_priority(&pi_sems[sem_id], NULL);
+        }       
         spin_unlock_irqrestore(&pi_sems[sem_id].wait.lock, flags);                      
         return 0;
 }