aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beulich <JBeulich@novell.com>2011-03-01 14:28:02 +0000
committerWilly Tarreau <w@1wt.eu>2011-04-30 16:53:37 +0200
commit9af6e0ed236ce88bbd7c9f7d9a09c270c66f17f8 (patch)
tree03b5da89a2cdf901bf9db2b5f7cbd17de5a99952
parent0d945c266b91e7e6112ed640db9583ea6147152a (diff)
x86: Fix a bogus unwind annotation in lib/semaphore_32.S
commit e938c287ea8d977e079f07464ac69923412663ce upstream. 'simple' would have required specifying current frame address and return address location manually, but that's obviously not the case (and not necessary) here. Signed-off-by: Jan Beulich <jbeulich@novell.com> LKML-Reference: <4D6D1082020000780003454C@vpn.id2.novell.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--arch/x86/lib/semaphore_32.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/semaphore_32.S b/arch/x86/lib/semaphore_32.S
index 648fe474178..f35eec78a68 100644
--- a/arch/x86/lib/semaphore_32.S
+++ b/arch/x86/lib/semaphore_32.S
@@ -36,7 +36,7 @@
*/
#ifdef CONFIG_SMP
ENTRY(__write_lock_failed)
- CFI_STARTPROC simple
+ CFI_STARTPROC
FRAME
2: LOCK_PREFIX
addl $ RW_LOCK_BIAS,(%eax)