Added priority inheritance within semaphores - compiles but has not been

tested.

1 files changed, 6 insertions, 5 deletions

diff --git a/arch/i386/kernel/pi_sem_syscalls.c b/arch/i386/kernel/pi_sem_syscalls.c
index 3b196abba5..07c11fd327 100644
--- a/arch/i386/kernel/pi_sem_syscalls.c
+++ b/arch/i386/kernel/pi_sem_syscalls.c
@@ -8,8 +8,8 @@
  */
 
 #include <asm/atomic.h>
+#include <linux/sched.h>
 #include <linux/wait.h>
-#include <linux/rt_param.h>
 
 asmlinkage long sys_pi_sema_init (struct pi_semaphore *sem)
 {
@@ -28,7 +28,6 @@ fastcall void __pi_up_wakeup(void /* special register calling convention */);
  * "__down_failed" is a special asm handler that calls the C
  * routine that actually waits. See arch/i386/kernel/semaphore.c
  */
-/* TODO: Update sem prio, if necessary, by modifying __down_failed? */
 asmlinkage long sys_pi_down(struct pi_semaphore * sem)
 {
         might_sleep();
@@ -49,7 +48,6 @@ asmlinkage long sys_pi_down(struct pi_semaphore * sem)
  * Note! This is subtle. We jump to wake people up only if
  * the semaphore was negative (== somebody was waiting on it).
  */
-/* TODO: add to __up_wakeup to update sem prio! */
 asmlinkage long sys_pi_up(struct pi_semaphore * sem)
 {
         __asm__ __volatile__(
@@ -65,15 +63,18 @@ asmlinkage long sys_pi_up(struct pi_semaphore * sem)
         return 0;
 }
 
+/* Clear wait queue and wakeup waiting tasks. */
 asmlinkage long sys_pi_sema_free_wq(struct pi_semaphore * sem)
 {
-        /* TODO: clear queue here... */
         struct list_head *tmp, *next;
         unsigned long flags;
 
         spin_lock_irqsave(&sem->wait.lock, flags);
-        list_for_each_safe(tmp, next, &sem->wait.task_list)                 
+        list_for_each_safe(tmp, next, &sem->wait.task_list) {               
+                wait_queue_t *curr = list_entry(tmp, wait_queue_t, task_list);
                 list_del(tmp);
+                curr->func(curr, TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE, 0, NULL);
+        }
         spin_unlock_irqrestore(&sem->wait.lock, flags);
         
         return 0;