leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390/clean-up: use CFI_* macros in entry.S

Browse Source 
Commit f19fbd5ed6 ("s390: introduce execute-trampolines for
branches") introduces .cfi_* assembler directives.  Instead of
using the directives directly, use the macros from asm/dwarf.h.
This also ensures that the dwarf debug information are created
in the .debug_frame section.

Fixes: f19fbd5ed6 ("s390: introduce execute-trampolines for branches")
Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Hendrik Brueckner 2018-02-19 11:27:09 +01:00 committed by Martin Schwidefsky
parent 2cb370d615
commit dc24b7b49a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/s390/kernel/entry.S
View File

@ -14,6 +14,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/cache.h> #include <asm/cache.h>
#include <asm/ctl_reg.h> #include <asm/ctl_reg.h>
#include <asm/dwarf.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
@ -230,7 +231,7 @@ _PIF_WORK = (_PIF_PER_TRAP | _PIF_SYSCALL_RESTART)
.hidden \name .hidden \name
.type \name,@function .type \name,@function
\name: \name:
.cfi_startproc CFI_STARTPROC
#ifdef CONFIG_HAVE_MARCH_Z10_FEATURES #ifdef CONFIG_HAVE_MARCH_Z10_FEATURES
exrl 0,0f exrl 0,0f
#else #else
@ -239,7 +240,7 @@ _PIF_WORK = (_PIF_PER_TRAP | _PIF_SYSCALL_RESTART)
#endif #endif
j . j .
0: br \reg 0: br \reg
.cfi_endproc CFI_ENDPROC
.endm .endm
GEN_BR_THUNK __s390x_indirect_jump_r1use_r9,%r9,%r1 GEN_BR_THUNK __s390x_indirect_jump_r1use_r9,%r9,%r1