diff options
| author | Matthew Wilcox <matthew@wil.cx> | 2008-03-07 21:55:58 -0500 |
|---|---|---|
| committer | Matthew Wilcox <willy@linux.intel.com> | 2008-04-17 10:42:34 -0400 |
| commit | 64ac24e738823161693bf791f87adc802cf529ff (patch) | |
| tree | 19c0b0cf314d4394ca580c05b86cdf874ce0a167 /arch/x86/lib | |
| parent | e48b3deee475134585eed03e7afebe4bf9e0dba9 (diff) | |
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>
Diffstat (limited to 'arch/x86/lib')
| -rw-r--r-- | arch/x86/lib/semaphore_32.S | 83 | ||||
| -rw-r--r-- | arch/x86/lib/thunk_64.S | 5 |
2 files changed, 0 insertions, 88 deletions
diff --git a/arch/x86/lib/semaphore_32.S b/arch/x86/lib/semaphore_32.S index 3899bd37fdf0..648fe4741782 100644 --- a/arch/x86/lib/semaphore_32.S +++ b/arch/x86/lib/semaphore_32.S | |||
| @@ -30,89 +30,6 @@ | |||
| 30 | * value or just clobbered.. | 30 | * value or just clobbered.. |
| 31 | */ | 31 | */ |
| 32 | .section .sched.text, "ax" | 32 | .section .sched.text, "ax" |
| 33 | ENTRY(__down_failed) | ||
| 34 | CFI_STARTPROC | ||
| 35 | FRAME | ||
| 36 | pushl %edx | ||
| 37 | CFI_ADJUST_CFA_OFFSET 4 | ||
| 38 | CFI_REL_OFFSET edx,0 | ||
| 39 | pushl %ecx | ||
| 40 | CFI_ADJUST_CFA_OFFSET 4 | ||
| 41 | CFI_REL_OFFSET ecx,0 | ||
| 42 | call __down | ||
| 43 | popl %ecx | ||
| 44 | CFI_ADJUST_CFA_OFFSET -4 | ||
| 45 | CFI_RESTORE ecx | ||
| 46 | popl %edx | ||
| 47 | CFI_ADJUST_CFA_OFFSET -4 | ||
| 48 | CFI_RESTORE edx | ||
| 49 | ENDFRAME | ||
| 50 | ret | ||
| 51 | CFI_ENDPROC | ||
| 52 | ENDPROC(__down_failed) | ||
| 53 | |||
| 54 | ENTRY(__down_failed_interruptible) | ||
| 55 | CFI_STARTPROC | ||
| 56 | FRAME | ||
| 57 | pushl %edx | ||
| 58 | CFI_ADJUST_CFA_OFFSET 4 | ||
| 59 | CFI_REL_OFFSET edx,0 | ||
| 60 | pushl %ecx | ||
| 61 | CFI_ADJUST_CFA_OFFSET 4 | ||
| 62 | CFI_REL_OFFSET ecx,0 | ||
| 63 | call __down_interruptible | ||
| 64 | popl %ecx | ||
| 65 | CFI_ADJUST_CFA_OFFSET -4 | ||
| 66 | CFI_RESTORE ecx | ||
| 67 | popl %edx | ||
| 68 | CFI_ADJUST_CFA_OFFSET -4 | ||
| 69 | CFI_RESTORE edx | ||
| 70 | ENDFRAME | ||
| 71 | ret | ||
| 72 | CFI_ENDPROC | ||
| 73 | ENDPROC(__down_failed_interruptible) | ||
| 74 | |||
| 75 | ENTRY(__down_failed_trylock) | ||
| 76 | CFI_STARTPROC | ||
| 77 | FRAME | ||
| 78 | pushl %edx | ||
| 79 | CFI_ADJUST_CFA_OFFSET 4 | ||
| 80 | CFI_REL_OFFSET edx,0 | ||
| 81 | pushl %ecx | ||
| 82 | CFI_ADJUST_CFA_OFFSET 4 | ||
| 83 | CFI_REL_OFFSET ecx,0 | ||
| 84 | call __down_trylock | ||
| 85 | popl %ecx | ||
| 86 | CFI_ADJUST_CFA_OFFSET -4 | ||
| 87 | CFI_RESTORE ecx | ||
| 88 | popl %edx | ||
| 89 | CFI_ADJUST_CFA_OFFSET -4 | ||
| 90 | CFI_RESTORE edx | ||
| 91 | ENDFRAME | ||
| 92 | ret | ||
| 93 | CFI_ENDPROC | ||
| 94 | ENDPROC(__down_failed_trylock) | ||
| 95 | |||
| 96 | ENTRY(__up_wakeup) | ||
| 97 | CFI_STARTPROC | ||
| 98 | FRAME | ||
| 99 | pushl %edx | ||
| 100 | CFI_ADJUST_CFA_OFFSET 4 | ||
| 101 | CFI_REL_OFFSET edx,0 | ||
| 102 | pushl %ecx | ||
| 103 | CFI_ADJUST_CFA_OFFSET 4 | ||
| 104 | CFI_REL_OFFSET ecx,0 | ||
| 105 | call __up | ||
| 106 | popl %ecx | ||
| 107 | CFI_ADJUST_CFA_OFFSET -4 | ||
| 108 | CFI_RESTORE ecx | ||
| 109 | popl %edx | ||
| 110 | CFI_ADJUST_CFA_OFFSET -4 | ||
| 111 | CFI_RESTORE edx | ||
| 112 | ENDFRAME | ||
| 113 | ret | ||
| 114 | CFI_ENDPROC | ||
| 115 | ENDPROC(__up_wakeup) | ||
| 116 | 33 | ||
| 117 | /* | 34 | /* |
| 118 | * rw spinlock fallbacks | 35 | * rw spinlock fallbacks |
diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S index 8b92d428ab02..e009251d4e9f 100644 --- a/arch/x86/lib/thunk_64.S +++ b/arch/x86/lib/thunk_64.S | |||
| @@ -41,11 +41,6 @@ | |||
| 41 | thunk rwsem_downgrade_thunk,rwsem_downgrade_wake | 41 | thunk rwsem_downgrade_thunk,rwsem_downgrade_wake |
| 42 | #endif | 42 | #endif |
| 43 | 43 | ||
| 44 | thunk __down_failed,__down | ||
| 45 | thunk_retrax __down_failed_interruptible,__down_interruptible | ||
| 46 | thunk_retrax __down_failed_trylock,__down_trylock | ||
| 47 | thunk __up_wakeup,__up | ||
| 48 | |||
| 49 | #ifdef CONFIG_TRACE_IRQFLAGS | 44 | #ifdef CONFIG_TRACE_IRQFLAGS |
| 50 | thunk trace_hardirqs_on_thunk,trace_hardirqs_on | 45 | thunk trace_hardirqs_on_thunk,trace_hardirqs_on |
| 51 | thunk trace_hardirqs_off_thunk,trace_hardirqs_off | 46 | thunk trace_hardirqs_off_thunk,trace_hardirqs_off |