patch-2.0.20 linux/include/asm-i386/semaphore.h

Next file: linux/kernel/ksyms.c
Previous file: linux/include/asm-i386/processor.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.0.19/linux/include/asm-i386/semaphore.h linux/include/asm-i386/semaphore.h
@@ -1,6 +1,8 @@
 #ifndef _I386_SEMAPHORE_H
 #define _I386_SEMAPHORE_H
 
+#include <linux/linkage.h>
+
 /*
  * SMP- and interrupt-safe semaphores..
  *
@@ -16,8 +18,11 @@
 #define MUTEX ((struct semaphore) { 1, 0, NULL })
 #define MUTEX_LOCKED ((struct semaphore) { 0, 0, NULL })
 
+asmlinkage void down_failed(void /* special register calling convention */);
+asmlinkage void up_wakeup(void /* special register calling convention */);
+
 extern void __down(struct semaphore * sem);
-extern void wake_up(struct wait_queue ** p);
+extern void __up(struct semaphore * sem);
 
 /*
  * This is ugly, but we want the default case to fall through.
@@ -34,7 +39,7 @@
 		"lock ; "
 #endif
 		"decl %0\n\t"
-		"js down_failed"
+		"js " SYMBOL_NAME_STR(down_failed)
 		:/* no outputs */
 		:"m" (sem->count), "c" (sem)
 		:"ax","dx","memory");
@@ -55,8 +60,8 @@
 		"lock ; "
 #endif
 		"incl %0\n\t"
-		"jle up_wakeup\n"
-		"1:"
+		"jle " SYMBOL_NAME_STR(up_wakeup)
+		"\n1:"
 		:/* no outputs */
 		:"m" (sem->count), "c" (sem)
 		:"ax", "dx", "memory");

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov