]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
s390/entry: Use lay instead of aghik
authorHeiko Carstens <hca@linux.ibm.com>
Wed, 26 Nov 2025 10:19:10 +0000 (11:19 +0100)
committerHeiko Carstens <hca@linux.ibm.com>
Wed, 26 Nov 2025 11:28:23 +0000 (12:28 +0100)
Use the lay instruction instead of aghik. aghik is only available since
z196, therefore compiling the kernel for z10 results in this error:

   arch/s390/kernel/entry.S: Assembler messages:
   arch/s390/kernel/entry.S:165: Error: Unrecognized opcode: `aghik'

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202511261518.nBbQN5h7-lkp@intel.com/
Fixes: f5730d44e05e ("s390: Add stackprotector support")
Reviewed-by: Jan Polensky <japo@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
arch/s390/kernel/entry.S

index 24cc33e668ea50e5ed9ca8560334925bb38f8741..c360087807d8a428bda6f5e6b6ad95ff1a9241be 100644 (file)
@@ -162,7 +162,7 @@ SYM_FUNC_START(__switch_to_asm)
        stg     %r3,__LC_CURRENT(%r13)          # store task struct of next
        stg     %r15,__LC_KERNEL_STACK(%r13)    # store end of kernel stack
        lg      %r15,__THREAD_ksp(%r1,%r3)      # load kernel stack of next
-       aghik   %r4,%r3,__TASK_pid
+       lay     %r4,__TASK_pid(%r3)
        mvc     __LC_CURRENT_PID(4,%r13),0(%r4) # store pid of next
        ALTERNATIVE "nop", "lpp _LPP_OFFSET(%r13)", ALT_FACILITY(40)
 #ifdef CONFIG_STACKPROTECTOR