[PATCH] i386: Remove lock section support in rwsem.h

Lock sections don't work the new dwarf2 unwinder
This generates slightly smaller code. It adds one more taken
jump to the fast path.

Also move the trampolines into semaphore.S and add proper CFI
annotations.

Cc: jbeulich@novell.com

Signed-off-by: Andi Kleen <ak@suse.de>

1 files changed, 63 insertions, 0 deletions

diff --git a/arch/i386/lib/semaphore.S b/arch/i386/lib/semaphore.S
index e16ff1696390..01f80b5c45d2 100644
--- a/arch/i386/lib/semaphore.S
+++ b/arch/i386/lib/semaphore.S
@@ -152,3 +152,66 @@ ENTRY(__read_lock_failed)
         END(__read_lock_failed)
 
 #endif
+
+/* Fix up special calling conventions */
+ENTRY(call_rwsem_down_read_failed)
+        CFI_STARTPROC
+        push %ecx
+        CFI_ADJUST_CFA_OFFSET 4
+        CFI_REL_OFFSET ecx,0
+        push %edx
+        CFI_ADJUST_CFA_OFFSET 4
+        CFI_REL_OFFSET edx,0
+        call rwsem_down_read_failed
+        pop %edx
+        CFI_ADJUST_CFA_OFFSET -4
+        pop %ecx
+        CFI_ADJUST_CFA_OFFSET -4
+        ret
+        CFI_ENDPROC
+        END(call_rwsem_down_read_failed)
+
+ENTRY(call_rwsem_down_write_failed)
+        CFI_STARTPROC
+        push %ecx
+        CFI_ADJUST_CFA_OFFSET 4
+        CFI_REL_OFFSET ecx,0
+        calll rwsem_down_write_failed
+        pop %ecx
+        CFI_ADJUST_CFA_OFFSET -4
+        ret
+        CFI_ENDPROC
+        END(call_rwsem_down_write_failed)
+
+ENTRY(call_rwsem_wake)
+        CFI_STARTPROC
+        decw %dx    /* do nothing if still outstanding active readers */
+        jnz 1f
+        push %ecx
+        CFI_ADJUST_CFA_OFFSET 4
+        CFI_REL_OFFSET ecx,0
+        call rwsem_wake
+        pop %ecx
+        CFI_ADJUST_CFA_OFFSET -4
+1:      ret
+        CFI_ENDPROC
+        END(call_rwsem_wake)
+
+/* Fix up special calling conventions */
+ENTRY(call_rwsem_downgrade_wake)
+        CFI_STARTPROC
+        push %ecx
+        CFI_ADJUST_CFA_OFFSET 4
+        CFI_REL_OFFSET ecx,0
+        push %edx
+        CFI_ADJUST_CFA_OFFSET 4
+        CFI_REL_OFFSET edx,0
+        call rwsem_downgrade_wake
+        pop %edx
+        CFI_ADJUST_CFA_OFFSET -4
+        pop %ecx
+        CFI_ADJUST_CFA_OFFSET -4
+        ret
+        CFI_ENDPROC
+        END(call_rwsem_downgrade_wake)
+