Converting spinlocks to queuelocks in my code, and also fixing stubs... in

process...

2 files changed, 6 insertions, 4 deletions

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