diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /arch/i386/lib | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'arch/i386/lib')
| -rw-r--r-- | arch/i386/lib/Makefile | 2 | ||||
| -rw-r--r-- | arch/i386/lib/semaphore.S | 51 |
2 files changed, 1 insertions, 52 deletions
diff --git a/arch/i386/lib/Makefile b/arch/i386/lib/Makefile index c2cb3e5a6..a6f8dff09 100644 --- a/arch/i386/lib/Makefile +++ b/arch/i386/lib/Makefile @@ -6,7 +6,7 @@ $(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c $< -o $*.o L_TARGET = lib.a -L_OBJS = checksum.o old-checksum.o semaphore.o delay.o \ +L_OBJS = checksum.o old-checksum.o delay.o \ usercopy.o getuser.o putuser.o include $(TOPDIR)/Rules.make diff --git a/arch/i386/lib/semaphore.S b/arch/i386/lib/semaphore.S deleted file mode 100644 index 3f6e27fcc..000000000 --- a/arch/i386/lib/semaphore.S +++ /dev/null @@ -1,51 +0,0 @@ -/* - * linux/arch/i386/lib/semaphore.S - * - * Copyright (C) 1996 Linus Torvalds - */ - -#include <linux/linkage.h> - -/* - * 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 /* save %eax */ - pushl %edx /* save %edx */ - pushl %ecx /* save %ecx (and argument) */ - call SYMBOL_NAME(__down) - popl %ecx /* restore %ecx (count on __down not changing it) */ - popl %edx /* restore %edx */ - popl %eax /* restore %eax */ - ret - -/* Don't save/restore %eax, because that will be our return value */ -ENTRY(__down_failed_interruptible) - 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 - -/* Don't save/restore %eax, because that will be our return value */ -ENTRY(__down_failed_trylock) - pushl %edx /* save %edx */ - pushl %ecx /* save %ecx (and argument) */ - call SYMBOL_NAME(__down_trylock) - popl %ecx /* restore %ecx (count on __down_trylock not changing it) */ - popl %edx /* restore %edx */ - ret - -ENTRY(__up_wakeup) - pushl %eax /* save %eax */ - pushl %edx /* save %edx */ - pushl %ecx /* save %ecx (and argument) */ - call SYMBOL_NAME(__up) - popl %ecx /* restore %ecx (count on __up not changing it) */ - popl %edx /* restore %edx */ - popl %eax /* restore %eax */ - ret |