diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2015-02-13 07:04:39 -0500 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2015-03-25 06:49:34 -0400 |
commit | 4bfc86ce9436ea8064cad90fd891625bd814be1d (patch) | |
tree | 1236109ded892f3305bef2d38bfa524bbb170c9e /arch/s390/kernel | |
parent | 5a79859ae0f35d25c67a03e82bf0c80592f16a39 (diff) |
s390: remove "64" suffix from a couple of files
Rename a couple of files to get rid of the "64" suffix.
"git blame" will still work.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel')
-rw-r--r-- | arch/s390/kernel/Makefile | 2 | ||||
-rw-r--r-- | arch/s390/kernel/entry.S (renamed from arch/s390/kernel/entry64.S) | 0 | ||||
-rw-r--r-- | arch/s390/kernel/reipl.S (renamed from arch/s390/kernel/reipl64.S) | 4 | ||||
-rw-r--r-- | arch/s390/kernel/relocate_kernel.S (renamed from arch/s390/kernel/relocate_kernel64.S) | 0 |
4 files changed, 3 insertions, 3 deletions
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 | |||
33 | obj-y += debug.o irq.o ipl.o dis.o diag.o sclp.o vdso.o | 33 | obj-y += debug.o irq.o ipl.o dis.o diag.o sclp.o vdso.o |
34 | obj-y += sysinfo.o jump_label.o lgr.o os_info.o machine_kexec.o pgm_check.o | 34 | obj-y += sysinfo.o jump_label.o lgr.o os_info.o machine_kexec.o pgm_check.o |
35 | obj-y += runtime_instr.o cache.o dumpstack.o | 35 | obj-y += runtime_instr.o cache.o dumpstack.o |
36 | obj-y += entry64.o reipl64.o relocate_kernel64.o | 36 | obj-y += entry.o reipl.o relocate_kernel.o |
37 | 37 | ||
38 | extra-y += head.o head64.o vmlinux.lds | 38 | extra-y += head.o head64.o vmlinux.lds |
39 | 39 | ||
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) | |||
84 | mvc __LC_PGM_NEW_PSW(16),.Lpcnew-.Lpg0(%r13) | 84 | mvc __LC_PGM_NEW_PSW(16),.Lpcnew-.Lpg0(%r13) |
85 | stsch .Lschib-.Lpg0(%r13) | 85 | stsch .Lschib-.Lpg0(%r13) |
86 | oi .Lschib+5-.Lpg0(%r13),0x84 | 86 | oi .Lschib+5-.Lpg0(%r13),0x84 |
87 | .Lecs: xi .Lschib+27-.Lpg0(%r13),0x01 | 87 | .Lecs: xi .Lschib+27-.Lpg0(%r13),0x01 |
88 | msch .Lschib-.Lpg0(%r13) | 88 | msch .Lschib-.Lpg0(%r13) |
89 | lghi %r0,5 | 89 | lghi %r0,5 |
90 | .Lssch: ssch .Liplorb-.Lpg0(%r13) | 90 | .Lssch: ssch .Liplorb-.Lpg0(%r13) |
@@ -106,7 +106,7 @@ ENTRY(do_reipl_asm) | |||
106 | bas %r14,.Ldisab-.Lpg0(%r13) | 106 | bas %r14,.Ldisab-.Lpg0(%r13) |
107 | .L003: st %r1,__LC_SUBCHANNEL_ID | 107 | .L003: st %r1,__LC_SUBCHANNEL_ID |
108 | lhi %r1,0 # mode 0 = esa | 108 | lhi %r1,0 # mode 0 = esa |
109 | slr %r0,%r0 # set cpuid to zero | 109 | slr %r0,%r0 # set cpuid to zero |
110 | sigp %r1,%r0,SIGP_SET_ARCHITECTURE # switch to esa mode | 110 | sigp %r1,%r0,SIGP_SET_ARCHITECTURE # switch to esa mode |
111 | lpsw 0 | 111 | lpsw 0 |
112 | .Ldisab: sll %r14,1 | 112 | .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 | |||