s390: Rename head64.S to head.S

All the code is 64 bit, therefore remove the superfluous suffix.

Reviewed-by: Jens Remus <jremus@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index ecaee29e724e6e8af5c8cbb2935030b2afb4bac3..7df060b8eb4ef1f2253e532b0fd972b602fecfe2 100644 (file)
--- 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 (file)
index 0000000..7edb9de
--- /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 <hp@de.ibm.com>
+ *             Martin Schwidefsky <schwidefsky@de.ibm.com>
+ *             Rob van der Heij <rvdhei@iae.nl>
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/linkage.h>
+#include <asm/lowcore.h>
+#include <asm/asm-offsets.h>
+#include <asm/thread_info.h>
+#include <asm/page.h>
+#include <asm/ptrace.h>
+
+__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 (file)
index 7edb9de..0000000
--- 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 <hp@de.ibm.com>
- *             Martin Schwidefsky <schwidefsky@de.ibm.com>
- *             Rob van der Heij <rvdhei@iae.nl>
- *
- */
-
-#include <linux/init.h>
-#include <linux/linkage.h>
-#include <asm/lowcore.h>
-#include <asm/asm-offsets.h>
-#include <asm/thread_info.h>
-#include <asm/page.h>
-#include <asm/ptrace.h>
-
-__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 1edb2281e7b0b4c18e8d2c543af662e77cc59e66..c1fe0b53c5ac506d216d4f0518336e6466bc275c 100644 (file)
--- 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