aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/boot/compressed
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2015-02-13 07:04:39 -0500
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2015-03-25 06:49:34 -0400
commit4bfc86ce9436ea8064cad90fd891625bd814be1d (patch)
tree1236109ded892f3305bef2d38bfa524bbb170c9e /arch/s390/boot/compressed
parent5a79859ae0f35d25c67a03e82bf0c80592f16a39 (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/boot/compressed')
-rw-r--r--arch/s390/boot/compressed/Makefile8
-rw-r--r--arch/s390/boot/compressed/head.S (renamed from arch/s390/boot/compressed/head64.S)0
2 files changed, 4 insertions, 4 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 @@
6 6
7targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 7targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2
8targets += vmlinux.bin.xz vmlinux.bin.lzma vmlinux.bin.lzo vmlinux.bin.lz4 8targets += vmlinux.bin.xz vmlinux.bin.lzma vmlinux.bin.lzo vmlinux.bin.lz4
9targets += misc.o piggy.o sizes.h head64.o 9targets += misc.o piggy.o sizes.h head.o
10 10
11KBUILD_CFLAGS := -m64 -D__KERNEL__ $(LINUX_INCLUDE) -O2 11KBUILD_CFLAGS := -m64 -D__KERNEL__ $(LINUX_INCLUDE) -O2
12KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING 12KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
@@ -17,7 +17,7 @@ KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
17GCOV_PROFILE := n 17GCOV_PROFILE := n
18 18
19OBJECTS := $(addprefix $(objtree)/arch/s390/kernel/, head.o sclp.o ebcdic.o) 19OBJECTS := $(addprefix $(objtree)/arch/s390/kernel/, head.o sclp.o ebcdic.o)
20OBJECTS += $(obj)/head64.o $(obj)/misc.o $(obj)/piggy.o 20OBJECTS += $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o
21 21
22LDFLAGS_vmlinux := --oformat $(LD_BFD) -e startup -T 22LDFLAGS_vmlinux := --oformat $(LD_BFD) -e startup -T
23$(obj)/vmlinux: $(obj)/vmlinux.lds $(OBJECTS) 23$(obj)/vmlinux: $(obj)/vmlinux.lds $(OBJECTS)
@@ -32,8 +32,8 @@ quiet_cmd_sizes = GEN $@
32$(obj)/sizes.h: vmlinux 32$(obj)/sizes.h: vmlinux
33 $(call if_changed,sizes) 33 $(call if_changed,sizes)
34 34
35AFLAGS_head64.o += -I$(obj) 35AFLAGS_head.o += -I$(obj)
36$(obj)/head64.o: $(obj)/sizes.h 36$(obj)/head.o: $(obj)/sizes.h
37 37
38CFLAGS_misc.o += -I$(obj) 38CFLAGS_misc.o += -I$(obj)
39$(obj)/misc.o: $(obj)/sizes.h 39$(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