Commit-ID:  82ef36449d311a29b20f82fdce0de856057fa691
Gitweb:     http://git.kernel.org/tip/82ef36449d311a29b20f82fdce0de856057fa691
Author:     Jan Beulich <jbeul...@suse.com>
AuthorDate: Wed, 24 Sep 2014 08:41:30 +0100
Committer:  Thomas Gleixner <t...@linutronix.de>
CommitDate: Wed, 8 Oct 2014 10:05:50 +0200

x86: Unwind-annotate thunk_32.S

Signed-off-by: Jan Beulich <jbeul...@suse.com>
Link: http://lkml.kernel.org/r/542291ca0200007800038...@mail.emea.novell.com
Signed-off-by: Thomas Gleixner <t...@linutronix.de>
---
 arch/x86/lib/thunk_32.S | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/arch/x86/lib/thunk_32.S b/arch/x86/lib/thunk_32.S
index e9acf5f..5f72e53 100644
--- a/arch/x86/lib/thunk_32.S
+++ b/arch/x86/lib/thunk_32.S
@@ -11,9 +11,13 @@
        .macro THUNK name, func, put_ret_addr_in_eax=0
        .globl \name
 \name:
-       pushl %eax
-       pushl %ecx
-       pushl %edx
+       CFI_STARTPROC
+       pushl_cfi %eax
+       CFI_REL_OFFSET eax, 0
+       pushl_cfi %ecx
+       CFI_REL_OFFSET ecx, 0
+       pushl_cfi %edx
+       CFI_REL_OFFSET edx, 0
 
        .if \put_ret_addr_in_eax
        /* Place EIP in the arg1 */
@@ -21,10 +25,14 @@
        .endif
 
        call \func
-       popl %edx
-       popl %ecx
-       popl %eax
+       popl_cfi %edx
+       CFI_RESTORE edx
+       popl_cfi %ecx
+       CFI_RESTORE ecx
+       popl_cfi %eax
+       CFI_RESTORE eax
        ret
+       CFI_ENDPROC
        _ASM_NOKPROBE(\name)
        .endm
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to