ix86: unwind-annotate thunk_32.S
PATCH 1/1 ix86: unwind-annotate thunk_32.S
Signed-off-by Jan Beulich <[email protected]>
--- arch/x86/lib/thunk_32.S | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
arch/x86/lib/thunk_32.S +15 -6
@@ -6,22 +6,31 @@ */ #include <linux/linkage.h> #include <asm/asm.h> + #include <asm/dwarf2.h> #ifdef CONFIG_TRACE_IRQFLAGS /* put return address in eax (arg1) */ .macro thunk_ra name,func .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 /* Place EIP in the arg1 */ movl 3*4(%esp), %eax 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
tip-bot for Jan Beulich
merge bot[tip:x86/asm] x86: Unwind-annotate thunk_32.S
x86: Unwind-annotate thunk_32.S
Commit-ID: 82ef36449d311a29b20f82fdce0de856057fa691 Gitweb: http://git.kernel.org/tip/82ef36449d311a29b20f82fdce0de856057fa691 Author: Jan Beulich <[email protected]> AuthorDate: Wed, 24 Sep 2014 08:41:30 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 8 Oct 2014 10:05:50 +0200
x86: Unwind-annotate thunk_32.S
Signed-off-by Jan Beulich <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
--- arch/x86/lib/thunk_32.S | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
arch/x86/lib/thunk_32.S +14 -6
@@ -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
tip-bot for Jan Beulich
merge bot[tip:x86/asm] x86: Unwind-annotate thunk_32.S
In reply to Jan Beulichx86: Unwind-annotate thunk_32.S
Commit-ID: f74954f01ec9bb2004bcc24f247d1f26f1063ad2 Gitweb: http://git.kernel.org/tip/f74954f01ec9bb2004bcc24f247d1f26f1063ad2 Author: Jan Beulich <[email protected]> AuthorDate: Wed, 24 Sep 2014 08:41:30 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 8 Oct 2014 12:31:45 +0200
x86: Unwind-annotate thunk_32.S
Signed-off-by Jan Beulich <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
--- arch/x86/lib/thunk_32.S | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
arch/x86/lib/thunk_32.S +15 -6
@@ -6,14 +6,19 @@ */ #include <linux/linkage.h> #include <asm/asm.h> + #include <asm/dwarf2.h> /* put return address in eax (arg1) */ .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 +26,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