Various changes that I don't want to lose, but the code does not work.

1 files changed, 25 insertions, 21 deletions

diff --git a/arch/i386/kernel/pi_sem_syscalls.c b/arch/i386/kernel/pi_sem_syscalls.c
index 273eec16d3..1b85abae27 100644
--- a/arch/i386/kernel/pi_sem_syscalls.c
+++ b/arch/i386/kernel/pi_sem_syscalls.c
@@ -58,16 +58,18 @@ fastcall void __pi_up_wakeup(void /* special register calling convention */);
 void __sys_pi_down(struct pi_semaphore * sem)
 {
         might_sleep();
-        __asm__ __volatile__(
-                "# atomic down operation\n\t"
-                LOCK_PREFIX "decl %0\n\t"     /* --sem->count */
-                "jns 2f\n"
-                "\tlea %0,%%eax\n\t"
-                "call __pi_down_failed\n"
-                "2:"
-                :"+m" (sem->count)
-                :
-                :"memory","ax");
+//      __asm__ __volatile__(
+//              "# atomic down operation\n\t"
+//              LOCK_PREFIX "decl %0\n\t"     /* --sem->count */
+//              "jns 2f\n"
+//              "\tlea %0,%%eax\n\t"
+//              "call __pi_down_failed\n"
+//              "2:"
+//              :"+m" (sem->count)
+//              :
+//              :"memory","ax");
+        if (atomic_dec_return(&sem->count) < 0)
+                __pi_down(sem);
 }
 
 asmlinkage long sys_pi_down(pi_sema_id sem_id)
@@ -82,8 +84,8 @@ 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 (!pi_sems[sem_id].holder) {
-               pi_sems[sem_id].holder = current;
-               curr_sched_plugin->inherit_priority(&pi_sems[sem_id], NULL);
+                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;
@@ -96,16 +98,18 @@ asmlinkage long sys_pi_down(pi_sema_id sem_id)
  */
 void __sys_pi_up(struct pi_semaphore * sem)
 {
-        __asm__ __volatile__(
-                "# atomic up operation\n\t"
-                LOCK_PREFIX "incl %0\n\t"     /* ++sem->count */
+//      __asm__ __volatile__(
+//              "# atomic up operation\n\t"
+//              LOCK_PREFIX "incl %0\n\t"     /* ++sem->count */
 /*              "jg 1f\n\t" *** removed, always call wakeup *** */
-                "lea %0,%%eax\n\t"
-                "call __pi_up_wakeup\n"
-                "1:"
-                :"+m" (sem->count)
-                :
-                :"memory","ax");
+//              "lea %0,%%eax\n\t"
+//              "call __pi_up_wakeup\n"
+//              "1:"
+//              :"+m" (sem->count)
+//              :
+//              :"memory","ax");
+        atomic_inc(&sem->count);
+        __pi_up(sem);
 }
 
 asmlinkage long sys_pi_up(pi_sema_id sem_id)