2011-03-01 14:28:09

by Jan Beulich

Subject: [PATCH] ix86: fix a bogus unwind annotation in lib/semaphore_32.S

'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 <[email protected]>

---
arch/x86/lib/semaphore_32.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- 2.6.38-rc6/arch/x86/lib/semaphore_32.S
+++ 2.6.38-rc6-ix86-unwind-write_lock_failed/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)

2011-03-02 08:43:08

by Jan Beulich

Subject: [tip:x86/asm] x86: Fix a bogus unwind annotation in lib/semaphore_32.S

Commit-ID: e938c287ea8d977e079f07464ac69923412663ce
Gitweb: http://git.kernel.org/tip/e938c287ea8d977e079f07464ac69923412663ce
Author: Jan Beulich <[email protected]>
AuthorDate: Tue, 1 Mar 2011 14:28:02 +0000
Committer: Ingo Molnar <[email protected]>
CommitDate: Wed, 2 Mar 2011 08:16:44 +0100

x86: Fix a bogus unwind annotation in lib/semaphore_32.S

'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 <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
---
arch/x86/lib/semaphore_32.S | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/lib/semaphore_32.S b/arch/x86/lib/semaphore_32.S
index 48e44f7..06691da 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)