x86: coding style fixes to arch/x86/lib/strstr_3

[linux-2.6-omap-h63xx.git] / arch / x86 / lib / semaphore_32.S

diff --git a/arch/x86/lib/semaphore_32.S b/arch/x86/lib/semaphore_32.S
index c01eb39c0b43160738fd0cba92fa9e9c38f1629d..3899bd37fdf0b445cfca6b4f747950b371cebe82 100644 (file)
--- a/arch/x86/lib/semaphore_32.S
+++ b/arch/x86/lib/semaphore_32.S
@@ -15,8 +15,8 @@
 
 #include <linux/linkage.h>
 #include <asm/rwlock.h>
-#include <asm/alternative-asm.i>
-#include <asm/frame.i>
+#include <asm/alternative-asm.h>
+#include <asm/frame.h>
 #include <asm/dwarf2.h>
 
 /*
@@ -29,7 +29,7 @@
  * registers (%eax, %edx and %ecx) except %eax whish is either a return
  * value or just clobbered..
  */
-       .section .sched.text
+       .section .sched.text, "ax"
 ENTRY(__down_failed)
        CFI_STARTPROC
        FRAME
@@ -49,7 +49,7 @@ ENTRY(__down_failed)
        ENDFRAME
        ret
        CFI_ENDPROC
-       END(__down_failed)
+       ENDPROC(__down_failed)
 
 ENTRY(__down_failed_interruptible)
        CFI_STARTPROC
@@ -70,7 +70,7 @@ ENTRY(__down_failed_interruptible)
        ENDFRAME
        ret
        CFI_ENDPROC
-       END(__down_failed_interruptible)
+       ENDPROC(__down_failed_interruptible)
 
 ENTRY(__down_failed_trylock)
        CFI_STARTPROC
@@ -91,7 +91,7 @@ ENTRY(__down_failed_trylock)
        ENDFRAME
        ret
        CFI_ENDPROC
-       END(__down_failed_trylock)
+       ENDPROC(__down_failed_trylock)
 
 ENTRY(__up_wakeup)
        CFI_STARTPROC
@@ -112,7 +112,7 @@ ENTRY(__up_wakeup)
        ENDFRAME
        ret
        CFI_ENDPROC
-       END(__up_wakeup)
+       ENDPROC(__up_wakeup)
 
 /*
  * rw spinlock fallbacks
@@ -132,7 +132,7 @@ ENTRY(__write_lock_failed)
        ENDFRAME
        ret
        CFI_ENDPROC
-       END(__write_lock_failed)
+       ENDPROC(__write_lock_failed)
 
 ENTRY(__read_lock_failed)
        CFI_STARTPROC
@@ -148,7 +148,7 @@ ENTRY(__read_lock_failed)
        ENDFRAME
        ret
        CFI_ENDPROC
-       END(__read_lock_failed)
+       ENDPROC(__read_lock_failed)
 
 #endif
 
@@ -170,7 +170,7 @@ ENTRY(call_rwsem_down_read_failed)
        CFI_ADJUST_CFA_OFFSET -4
        ret
        CFI_ENDPROC
-       END(call_rwsem_down_read_failed)
+       ENDPROC(call_rwsem_down_read_failed)
 
 ENTRY(call_rwsem_down_write_failed)
        CFI_STARTPROC
@@ -182,7 +182,7 @@ ENTRY(call_rwsem_down_write_failed)
        CFI_ADJUST_CFA_OFFSET -4
        ret
        CFI_ENDPROC
-       END(call_rwsem_down_write_failed)
+       ENDPROC(call_rwsem_down_write_failed)
 
 ENTRY(call_rwsem_wake)
        CFI_STARTPROC
@@ -196,7 +196,7 @@ ENTRY(call_rwsem_wake)
        CFI_ADJUST_CFA_OFFSET -4
 1:     ret
        CFI_ENDPROC
-       END(call_rwsem_wake)
+       ENDPROC(call_rwsem_wake)
 
 /* Fix up special calling conventions */
 ENTRY(call_rwsem_downgrade_wake)
@@ -214,6 +214,6 @@ ENTRY(call_rwsem_downgrade_wake)
        CFI_ADJUST_CFA_OFFSET -4
        ret
        CFI_ENDPROC
-       END(call_rwsem_downgrade_wake)
+       ENDPROC(call_rwsem_downgrade_wake)
 
 #endif