patch-2.1.22 linux/arch/i386/lib/semaphore.S

• Lines: 36
• Date: Wed Jan 15 19:32:17 1997
• Orig file: v2.1.21/linux/arch/i386/lib/semaphore.S
• Orig date: Sat Oct 5 16:58:34 1996

diff -u --recursive --new-file v2.1.21/linux/arch/i386/lib/semaphore.S linux/arch/i386/lib/semaphore.S
@@ -7,21 +7,26 @@
 #include <linux/linkage.h>
 
 /*
- * "down_failed" is called with the eventual return address
- * in %eax, and the address of the semaphore in %ecx. We need
- * to call "__down()", and then re-try until we succeed..
+ * The semaphore operations have a special calling sequence that
+ * allow us to do a simpler in-line version of them. These routines
+ * need to convert that sequence back into the C sequence when
+ * there is contention on the semaphore.
  */
 ENTRY(__down_failed)
 	pushl %eax	/* return address */
 	pushl %edx	/* save %edx */
-1:	pushl %ecx	/* save %ecx (and argument) */
+	pushl %ecx	/* save %ecx (and argument) */
 	call SYMBOL_NAME(__down)
 	popl %ecx	/* restore %ecx (count on __down not changing it) */
-#ifdef __SMP__
-	lock
-#endif
-	decl (%ecx)
-	js 1b
+	popl %edx	/* restore %edx */
+	ret
+
+ENTRY(__down_failed_interruptible)
+	pushl %eax	/* return address */
+	pushl %edx	/* save %edx */
+	pushl %ecx	/* save %ecx (and argument) */
+	call SYMBOL_NAME(__down_interruptible)
+	popl %ecx	/* restore %ecx (count on __down_interruptible not changing it) */
 	popl %edx	/* restore %edx */
 	ret