Reverted back to spinlocks, added code to higher priority code in

edf-common.c, left other stubs untouched until tomorrow.

2 files changed, 4 insertions, 6 deletions

diff --git a/arch/i386/kernel/pi_sem_syscalls.c b/arch/i386/kernel/pi_sem_syscalls.c
index 04584a12fb..f7a66da110 100644
--- a/arch/i386/kernel/pi_sem_syscalls.c
+++ b/arch/i386/kernel/pi_sem_syscalls.c
@@ -8,7 +8,6 @@
 #include <asm/atomic.h>
 #include <linux/sched.h>
 #include <linux/wait.h>
-#include <linux/queuelock.h>
 
 #define MAX_PI_SEMAPHORES 256
 
@@ -111,14 +110,14 @@ asmlinkage long sys_pi_sema_free(pi_sema_id sem_id)
         struct list_head *tmp, *next;
         unsigned long flags;
 
-        queue_lock_irqsave(&pi_sems[sem_id].wait.lock, flags);
+        spin_lock_irqsave(&pi_sems[sem_id].wait.lock, flags);
         list_for_each_safe(tmp, next, &pi_sems[sem_id].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);
         }
-        queue_unlock_irqrestore(&pi_sems[sem_id].wait.lock, flags);
+        spin_unlock_irqrestore(&pi_sems[sem_id].wait.lock, flags);
         pi_sems[sem_id].used = 0;
 
         return 0;
diff --git a/arch/i386/kernel/sem_syscalls.c b/arch/i386/kernel/sem_syscalls.c
index 03713f41e6..2bdbc5fd96 100644
--- a/arch/i386/kernel/sem_syscalls.c
+++ b/arch/i386/kernel/sem_syscalls.c
@@ -6,7 +6,6 @@
 
 #include <asm/semaphore.h>
 #include <linux/sched.h>
-#include <linux/queuelock.h>
 
 #define MAX_SEMAPHORES 256
 
@@ -64,14 +63,14 @@ asmlinkage long sys_sema_free(sema_id sem_id)
         struct list_head *tmp, *next;
         unsigned long flags;
 
-        queue_lock_irqsave(&sems[sem_id].wait.lock, flags);
+        spin_lock_irqsave(&sems[sem_id].wait.lock, flags);
         list_for_each_safe(tmp, next, &sems[sem_id].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);
         }
-        queue_unlock_irqrestore(&sems[sem_id].wait.lock, flags);
+        spin_unlock_irqrestore(&sems[sem_id].wait.lock, flags);
         sems[sem_id].used = 0;
 
         return 0;