aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beulich <JBeulich@novell.com>2011-03-01 14:28:02 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-22 08:49:58 -0700
commite551c3f6f8920c2a8502b424aee2ce8bc1e2e4b6 (patch)
treed040ce406bc6682416c4afb249aa1255aeb18dea
parent54fe0be52e948e04f5dd9ce57db40e11f7dad6de (diff)
downloadlinux-linaro-stable-e551c3f6f8920c2a8502b424aee2ce8bc1e2e4b6.tar.gz
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 648fe4741782..f35eec78a68e 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)