aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/lib/semaphore_32.S
diff options
context:
space:
mode:
authorJohn Reiser <jreiser@BitWagon.com>2008-01-30 07:33:13 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:33:13 -0500
commit6b8be6df7f971919622d152d144c8798ad7fd160 (patch)
tree8c7eabffa6402ab6e5c9306a8dac6a81d9347fae /arch/x86/lib/semaphore_32.S
parentfdfe8aa84dd78cfdff427d0520f5974fb5e9c220 (diff)
x86: add ENDPROC() markers
The ENDPROCs() were not used everywhere. Some code used just END() instead, while other code used nothing. um/sys-i386/checksum.S didn't #include <linux/linkage.h> . I also got confused because gcc puts the .type near the ENTRY, while ENDPROC puts it on the opposite end. Signed off by: John Reiser <jreiser@BitWagon.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/lib/semaphore_32.S')
-rw-r--r--arch/x86/lib/semaphore_32.S20
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/x86/lib/semaphore_32.S b/arch/x86/lib/semaphore_32.S
index 444fba400983..e2c6e0d5e125 100644
--- a/arch/x86/lib/semaphore_32.S
+++ b/arch/x86/lib/semaphore_32.S
@@ -49,7 +49,7 @@ ENTRY(__down_failed)
49 ENDFRAME 49 ENDFRAME
50 ret 50 ret
51 CFI_ENDPROC 51 CFI_ENDPROC
52 END(__down_failed) 52 ENDPROC(__down_failed)
53 53
54ENTRY(__down_failed_interruptible) 54ENTRY(__down_failed_interruptible)
55 CFI_STARTPROC 55 CFI_STARTPROC
@@ -70,7 +70,7 @@ ENTRY(__down_failed_interruptible)
70 ENDFRAME 70 ENDFRAME
71 ret 71 ret
72 CFI_ENDPROC 72 CFI_ENDPROC
73 END(__down_failed_interruptible) 73 ENDPROC(__down_failed_interruptible)
74 74
75ENTRY(__down_failed_trylock) 75ENTRY(__down_failed_trylock)
76 CFI_STARTPROC 76 CFI_STARTPROC
@@ -91,7 +91,7 @@ ENTRY(__down_failed_trylock)
91 ENDFRAME 91 ENDFRAME
92 ret 92 ret
93 CFI_ENDPROC 93 CFI_ENDPROC
94 END(__down_failed_trylock) 94 ENDPROC(__down_failed_trylock)
95 95
96ENTRY(__up_wakeup) 96ENTRY(__up_wakeup)
97 CFI_STARTPROC 97 CFI_STARTPROC
@@ -112,7 +112,7 @@ ENTRY(__up_wakeup)
112 ENDFRAME 112 ENDFRAME
113 ret 113 ret
114 CFI_ENDPROC 114 CFI_ENDPROC
115 END(__up_wakeup) 115 ENDPROC(__up_wakeup)
116 116
117/* 117/*
118 * rw spinlock fallbacks 118 * rw spinlock fallbacks
@@ -132,7 +132,7 @@ ENTRY(__write_lock_failed)
132 ENDFRAME 132 ENDFRAME
133 ret 133 ret
134 CFI_ENDPROC 134 CFI_ENDPROC
135 END(__write_lock_failed) 135 ENDPROC(__write_lock_failed)
136 136
137ENTRY(__read_lock_failed) 137ENTRY(__read_lock_failed)
138 CFI_STARTPROC 138 CFI_STARTPROC
@@ -148,7 +148,7 @@ ENTRY(__read_lock_failed)
148 ENDFRAME 148 ENDFRAME
149 ret 149 ret
150 CFI_ENDPROC 150 CFI_ENDPROC
151 END(__read_lock_failed) 151 ENDPROC(__read_lock_failed)
152 152
153#endif 153#endif
154 154
@@ -170,7 +170,7 @@ ENTRY(call_rwsem_down_read_failed)
170 CFI_ADJUST_CFA_OFFSET -4 170 CFI_ADJUST_CFA_OFFSET -4
171 ret 171 ret
172 CFI_ENDPROC 172 CFI_ENDPROC
173 END(call_rwsem_down_read_failed) 173 ENDPROC(call_rwsem_down_read_failed)
174 174
175ENTRY(call_rwsem_down_write_failed) 175ENTRY(call_rwsem_down_write_failed)
176 CFI_STARTPROC 176 CFI_STARTPROC
@@ -182,7 +182,7 @@ ENTRY(call_rwsem_down_write_failed)
182 CFI_ADJUST_CFA_OFFSET -4 182 CFI_ADJUST_CFA_OFFSET -4
183 ret 183 ret
184 CFI_ENDPROC 184 CFI_ENDPROC
185 END(call_rwsem_down_write_failed) 185 ENDPROC(call_rwsem_down_write_failed)
186 186
187ENTRY(call_rwsem_wake) 187ENTRY(call_rwsem_wake)
188 CFI_STARTPROC 188 CFI_STARTPROC
@@ -196,7 +196,7 @@ ENTRY(call_rwsem_wake)
196 CFI_ADJUST_CFA_OFFSET -4 196 CFI_ADJUST_CFA_OFFSET -4
1971: ret 1971: ret
198 CFI_ENDPROC 198 CFI_ENDPROC
199 END(call_rwsem_wake) 199 ENDPROC(call_rwsem_wake)
200 200
201/* Fix up special calling conventions */ 201/* Fix up special calling conventions */
202ENTRY(call_rwsem_downgrade_wake) 202ENTRY(call_rwsem_downgrade_wake)
@@ -214,6 +214,6 @@ ENTRY(call_rwsem_downgrade_wake)
214 CFI_ADJUST_CFA_OFFSET -4 214 CFI_ADJUST_CFA_OFFSET -4
215 ret 215 ret
216 CFI_ENDPROC 216 CFI_ENDPROC
217 END(call_rwsem_downgrade_wake) 217 ENDPROC(call_rwsem_downgrade_wake)
218 218
219#endif 219#endif