On Wed, Jul 26, 2023 at 08:18:34AM +0200, Heiko Carstens wrote: > Nathan Chancellor reported the following build error when compiling the > kernel with CONFIG_MARCH_Z10=y: > > arch/s390/kernel/mcount.S: Assembler messages: > arch/s390/kernel/mcount.S:140: Error: Unrecognized opcode: `aghik' > > The aghik instruction is only available since z196. Use the la instruction > instead which is available for all machines. > > Reported-by: Nathan Chancellor <nathan@xxxxxxxxxx> > Closes: https://lore.kernel.org/all/20230725211105.GA224840@dev-arch.thelio-3990X > Fixes: 1256e70a082a ("s390/ftrace: enable HAVE_FUNCTION_GRAPH_RETVAL") > Signed-off-by: Heiko Carstens <hca@xxxxxxxxxxxxx> Tested-by: Nathan Chancellor <nathan@xxxxxxxxxx> # build > --- > arch/s390/kernel/mcount.S | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/s390/kernel/mcount.S b/arch/s390/kernel/mcount.S > index d2596e0df6fa..71c5fa05e7f1 100644 > --- a/arch/s390/kernel/mcount.S > +++ b/arch/s390/kernel/mcount.S > @@ -137,7 +137,7 @@ SYM_FUNC_START(return_to_handler) > lgr %r1,%r15 > aghi %r15,-(STACK_FRAME_OVERHEAD+__FGRAPH_RET_SIZE) > stg %r1,__SF_BACKCHAIN(%r15) > - aghik %r3,%r15,STACK_FRAME_OVERHEAD > + la %r3,STACK_FRAME_OVERHEAD(%r15) > stg %r1,__FGRAPH_RET_FP(%r3) > stg %r2,__FGRAPH_RET_GPR2(%r3) > lgr %r2,%r3 > -- > 2.39.2 >
