Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc24b7b4 authored by Hendrik Brueckner's avatar Hendrik Brueckner Committed by Martin Schwidefsky
Browse files

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



Commit f19fbd5e ("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: f19fbd5e ("s390: introduce execute-trampolines for branches")
Signed-off-by: default avatarHendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 2cb370d6

arch/s390/kernel/entry.S

+3 −2
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <asm/processor.h>

#include <asm/cache.h>

#include <asm/ctl_reg.h>

#include <asm/dwarf.h>

#include <asm/errno.h>

#include <asm/ptrace.h>

#include <asm/thread_info.h>
@@ -230,7 +231,7 @@ _PIF_WORK = (_PIF_PER_TRAP | _PIF_SYSCALL_RESTART) 
	.hidden \name

	.type \name,@function

\name:

	.cfi_startproc

	CFI_STARTPROC

#ifdef CONFIG_HAVE_MARCH_Z10_FEATURES

	exrl	0,0f

#else
@@ -239,7 +240,7 @@ _PIF_WORK = (_PIF_PER_TRAP | _PIF_SYSCALL_RESTART) 
#endif

	j	.

0:	br	\reg

	.cfi_endproc

	CFI_ENDPROC

	.endm



	GEN_BR_THUNK __s390x_indirect_jump_r1use_r9,%r9,%r1