Another small fix to system call sys_pi_sema_init, in order to eliminate

another pointer issue.

1 files changed, 13 insertions, 10 deletions

diff --git a/arch/i386/kernel/pi_sem_syscalls.c b/arch/i386/kernel/pi_sem_syscalls.c
index 5f474d2779..bf79896654 100644
--- a/arch/i386/kernel/pi_sem_syscalls.c
+++ b/arch/i386/kernel/pi_sem_syscalls.c
@@ -19,7 +19,7 @@ typedef int pi_sema_id; /* Userspace ID of a pi_semaphore */
 /* Initialize PI semaphores at boot time. */
 void __init pi_sema_boot_init(void)
 {
-        int sem_id;
+        pi_sema_id sem_id;
 
         printk("Initializing PI semaphores...");
         for (sem_id = 0; sem_id < MAX_PI_SEMAPHORES; sem_id++)
@@ -28,15 +28,17 @@ void __init pi_sema_boot_init(void)
 }
 
 /* Find a free semaphore and assign to sem. */
-asmlinkage long sys_pi_sema_init (pi_sema_id *sem_id)
+asmlinkage long sys_pi_sema_init (void)
 {
-        for (*sem_id = 0; *sem_id < MAX_PI_SEMAPHORES; (*sem_id)++) {
-                if (!cmpxchg(&pi_sems[*sem_id].used, 0, 1)) {
-                        atomic_set(&pi_sems[*sem_id].count, 1);
-                        pi_sems[*sem_id].sleepers = 0;
-                        init_waitqueue_head(&pi_sems[*sem_id].wait);
-                        pi_sems[*sem_id].sem_prio = LOWEST_SEM_PRIO;
-                        return 0;
+        pi_sema_id sem_id;
+
+        for (sem_id = 0; sem_id < MAX_PI_SEMAPHORES; sem_id++) {
+                if (!cmpxchg(&pi_sems[sem_id].used, 0, 1)) {
+                        atomic_set(&pi_sems[sem_id].count, 1);
+                        pi_sems[sem_id].sleepers = 0;
+                        init_waitqueue_head(&pi_sems[sem_id].wait);
+                        pi_sems[sem_id].sem_prio = LOWEST_SEM_PRIO;
+                        return sem_id;
                 }
         }
         return -ENOMEM;
@@ -111,7 +113,8 @@ asmlinkage long sys_pi_sema_free(pi_sema_id sem_id)
         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);
+                curr->func(curr, TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE,
+                           0, NULL);
         }
         spin_unlock_irqrestore(&pi_sems[sem_id].wait.lock, flags);
         pi_sems[sem_id].used = 0;