From: Heiko Carstens Date: Mon, 24 Nov 2025 15:04:28 +0000 (+0100) Subject: s390: Rename head64.S to head.S X-Git-Tag: ceph-for-6.19-rc5~300^2~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b3bdfdf1f93c38ea54b93421efc413e91e61f6b3;p=ceph-client.git s390: Rename head64.S to head.S All the code is 64 bit, therefore remove the superfluous suffix. Reviewed-by: Jens Remus Signed-off-by: Heiko Carstens --- diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile index ecaee29e724e..7df060b8eb4e 100644 --- a/arch/s390/kernel/Makefile +++ b/arch/s390/kernel/Makefile @@ -36,7 +36,7 @@ CFLAGS_stacktrace.o += -fno-optimize-sibling-calls CFLAGS_dumpstack.o += -fno-optimize-sibling-calls CFLAGS_unwind_bc.o += -fno-optimize-sibling-calls -obj-y := head64.o traps.o time.o process.o early.o setup.o idle.o vtime.o +obj-y := head.o traps.o time.o process.o early.o setup.o idle.o vtime.o obj-y += processor.o syscall.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o obj-y += debug.o irq.o ipl.o dis.o vdso.o cpufeature.o obj-y += sysinfo.o lgr.o os_info.o ctlreg.o diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S new file mode 100644 index 000000000000..7edb9ded199c --- /dev/null +++ b/arch/s390/kernel/head.S @@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright IBM Corp. 1999, 2010 + * + * Author(s): Hartmut Penner + * Martin Schwidefsky + * Rob van der Heij + * + */ + +#include +#include +#include +#include +#include +#include +#include + +__HEAD +SYM_CODE_START(startup_continue) +# +# Setup stack +# + GET_LC %r2 + larl %r14,init_task + stg %r14,__LC_CURRENT(%r2) + larl %r15,init_thread_union+STACK_INIT_OFFSET + stg %r15,__LC_KERNEL_STACK(%r2) + brasl %r14,sclp_early_adjust_va # allow sclp_early_printk + brasl %r14,startup_init # s390 specific early init + brasl %r14,start_kernel # common init code +# +# We returned from start_kernel ?!? PANIK +# + basr %r13,0 + lpswe dw_psw-.(%r13) # load disabled wait psw +SYM_CODE_END(startup_continue) + + .balign 16 +SYM_DATA_LOCAL(dw_psw, .quad 0x0002000180000000,0x0000000000000000) diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S deleted file mode 100644 index 7edb9ded199c..000000000000 --- a/arch/s390/kernel/head64.S +++ /dev/null @@ -1,40 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * Copyright IBM Corp. 1999, 2010 - * - * Author(s): Hartmut Penner - * Martin Schwidefsky - * Rob van der Heij - * - */ - -#include -#include -#include -#include -#include -#include -#include - -__HEAD -SYM_CODE_START(startup_continue) -# -# Setup stack -# - GET_LC %r2 - larl %r14,init_task - stg %r14,__LC_CURRENT(%r2) - larl %r15,init_thread_union+STACK_INIT_OFFSET - stg %r15,__LC_KERNEL_STACK(%r2) - brasl %r14,sclp_early_adjust_va # allow sclp_early_printk - brasl %r14,startup_init # s390 specific early init - brasl %r14,start_kernel # common init code -# -# We returned from start_kernel ?!? PANIK -# - basr %r13,0 - lpswe dw_psw-.(%r13) # load disabled wait psw -SYM_CODE_END(startup_continue) - - .balign 16 -SYM_DATA_LOCAL(dw_psw, .quad 0x0002000180000000,0x0000000000000000) diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 1edb2281e7b0..c1fe0b53c5ac 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -110,7 +110,7 @@ struct exception_table_entry __amode31_ref *__stop_amode31_ex_table = _stop_amod * Because the AMODE31 sections are relocated below 2G at startup, * the content of control registers CR2, CR5 and CR15 must be updated * with new addresses after the relocation. The initial initialization of - * control registers occurs in head64.S and then gets updated again after AMODE31 + * control registers occurs in head.S and then gets updated again after AMODE31 * relocation. We must access the relevant AMODE31 tables indirectly via * pointers placed in the .amode31.refs linker section. Those pointers get * updated automatically during AMODE31 relocation and always contain a valid