Generic semaphore implementation

Semaphores are no longer performance-critical, so a generic C
implementation is better for maintainability, debuggability and
extensibility.  Thanks to Peter Zijlstra for fixing the lockdep
warning.  Thanks to Harvey Harrison for pointing out that the
unlikely() was unnecessary.

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Acked-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 1 insertions, 67 deletions

diff --git a/arch/m68knommu/lib/Makefile b/arch/m68knommu/lib/Makefile
index e051a791398..d94d709665a 100644
--- a/arch/m68knommu/lib/Makefile
+++ b/arch/m68knommu/lib/Makefile
@@ -4,4 +4,4 @@
 
 lib-y   := ashldi3.o ashrdi3.o lshrdi3.o \
            muldi3.o mulsi3.o divsi3.o udivsi3.o modsi3.o umodsi3.o \
-           checksum.o semaphore.o memcpy.o memset.o delay.o
+           checksum.o memcpy.o memset.o delay.o
diff --git a/arch/m68knommu/lib/semaphore.S b/arch/m68knommu/lib/semaphore.S
deleted file mode 100644
index 87c74603437..00000000000
--- a/arch/m68knommu/lib/semaphore.S
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *  linux/arch/m68k/lib/semaphore.S
- *
- *  Copyright (C) 1996  Linus Torvalds
- *
- *  m68k version by Andreas Schwab
- *
- *  MAR/1999 -- modified to support ColdFire (gerg@snapgear.com)
- */
-
-#include <linux/linkage.h>
-#include <asm/semaphore.h>
-
-/*
- * "down_failed" is called with the eventual return address
- * in %a0, and the address of the semaphore in %a1. We need
- * to increment the number of waiters on the semaphore,
- * call "__down()", and then eventually return to try again.
- */
-ENTRY(__down_failed)
-#ifdef CONFIG_COLDFIRE
-        subl #12,%sp
-        moveml %a0/%d0/%d1,(%sp)
-#else
-        moveml %a0/%d0/%d1,-(%sp)
-#endif
-        movel %a1,-(%sp)
-        jbsr __down
-        movel (%sp)+,%a1
-        movel (%sp)+,%d0
-        movel (%sp)+,%d1
-        rts
-
-ENTRY(__down_failed_interruptible)
-        movel %a0,-(%sp)
-        movel %d1,-(%sp)
-        movel %a1,-(%sp)
-        jbsr __down_interruptible
-        movel (%sp)+,%a1
-        movel (%sp)+,%d1
-        rts
-
-ENTRY(__up_wakeup)
-#ifdef CONFIG_COLDFIRE
-        subl #12,%sp
-        moveml %a0/%d0/%d1,(%sp)
-#else
-        moveml %a0/%d0/%d1,-(%sp)
-#endif
-        movel %a1,-(%sp)
-        jbsr __up
-        movel (%sp)+,%a1
-        movel (%sp)+,%d0
-        movel (%sp)+,%d1
-        rts
-
-ENTRY(__down_failed_trylock)
-        movel %a0,-(%sp)
-        movel %d1,-(%sp)
-        movel %a1,-(%sp)
-        jbsr __down_trylock
-        movel (%sp)+,%a1
-        movel (%sp)+,%d1
-        movel (%sp)+,%a0
-        rts
-