6 files changed, 7 insertions, 7 deletions

diff --git a/arch/s390/boot/compressed/Makefile b/arch/s390/boot/compressed/Makefile
index 254fb05c5d6c..d4788111c161 100644
--- a/arch/s390/boot/compressed/Makefile
+++ b/arch/s390/boot/compressed/Makefile
@@ -6,7 +6,7 @@
 
 targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2
 targets += vmlinux.bin.xz vmlinux.bin.lzma vmlinux.bin.lzo vmlinux.bin.lz4
-targets += misc.o piggy.o sizes.h head64.o
+targets += misc.o piggy.o sizes.h head.o
 
 KBUILD_CFLAGS := -m64 -D__KERNEL__ $(LINUX_INCLUDE) -O2
 KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
@@ -17,7 +17,7 @@ KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
 GCOV_PROFILE := n
 
 OBJECTS := $(addprefix $(objtree)/arch/s390/kernel/, head.o sclp.o ebcdic.o)
-OBJECTS += $(obj)/head64.o $(obj)/misc.o $(obj)/piggy.o
+OBJECTS += $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o
 
 LDFLAGS_vmlinux := --oformat $(LD_BFD) -e startup -T
 $(obj)/vmlinux: $(obj)/vmlinux.lds $(OBJECTS)
@@ -32,8 +32,8 @@ quiet_cmd_sizes = GEN $@
 $(obj)/sizes.h: vmlinux
         $(call if_changed,sizes)
 
-AFLAGS_head64.o += -I$(obj)
-$(obj)/head64.o: $(obj)/sizes.h
+AFLAGS_head.o += -I$(obj)
+$(obj)/head.o: $(obj)/sizes.h
 
 CFLAGS_misc.o += -I$(obj)
 $(obj)/misc.o: $(obj)/sizes.h
diff --git a/arch/s390/boot/compressed/head64.S b/arch/s390/boot/compressed/head.S
index f86a4eef28a9..f86a4eef28a9 100644
--- a/arch/s390/boot/compressed/head64.S
+++ b/arch/s390/boot/compressed/head.S
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index d94cbba95c50..a6d0b9dd05e6 100644
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -33,7 +33,7 @@ obj-y	+= processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o
 obj-y   += debug.o irq.o ipl.o dis.o diag.o sclp.o vdso.o
 obj-y   += sysinfo.o jump_label.o lgr.o os_info.o machine_kexec.o pgm_check.o
 obj-y   += runtime_instr.o cache.o dumpstack.o
-obj-y   += entry64.o reipl64.o relocate_kernel64.o
+obj-y   += entry.o reipl.o relocate_kernel.o
 
 extra-y                         += head.o head64.o vmlinux.lds
 
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry.S
index c329446a951d..c329446a951d 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry.S
diff --git a/arch/s390/kernel/reipl64.S b/arch/s390/kernel/reipl.S
index dc3b1273c4dc..52aab0bd84f8 100644
--- a/arch/s390/kernel/reipl64.S
+++ b/arch/s390/kernel/reipl.S
@@ -84,7 +84,7 @@ ENTRY(do_reipl_asm)
                 mvc     __LC_PGM_NEW_PSW(16),.Lpcnew-.Lpg0(%r13)
                 stsch   .Lschib-.Lpg0(%r13)
                 oi      .Lschib+5-.Lpg0(%r13),0x84
-.Lecs:          xi      .Lschib+27-.Lpg0(%r13),0x01
+.Lecs:          xi      .Lschib+27-.Lpg0(%r13),0x01
                 msch    .Lschib-.Lpg0(%r13)
                 lghi    %r0,5
 .Lssch:         ssch    .Liplorb-.Lpg0(%r13)
@@ -106,7 +106,7 @@ ENTRY(do_reipl_asm)
                 bas     %r14,.Ldisab-.Lpg0(%r13)
 .L003:          st      %r1,__LC_SUBCHANNEL_ID
                 lhi     %r1,0            # mode 0 = esa
-                slr     %r0,%r0          # set cpuid to zero
+                slr     %r0,%r0          # set cpuid to zero
                 sigp    %r1,%r0,SIGP_SET_ARCHITECTURE # switch to esa mode
                 lpsw    0
 .Ldisab:        sll     %r14,1
diff --git a/arch/s390/kernel/relocate_kernel64.S b/arch/s390/kernel/relocate_kernel.S
index cfac28330b03..cfac28330b03 100644
--- a/arch/s390/kernel/relocate_kernel64.S
+++ b/arch/s390/kernel/relocate_kernel.S