summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasily Gorbik <gor@linux.ibm.com>2018-07-01 11:31:48 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2018-07-02 12:32:21 +0200
commitb887b1b106654141ab034061ef0cc8d471ebc683 (patch)
tree99f48141a7eb658035a16667f69ae00842b356b8
parents390/sysinfo: add missing #ifdef CONFIG_PROC_FS (diff)
downloadlinux-b887b1b106654141ab034061ef0cc8d471ebc683.tar.xz
linux-b887b1b106654141ab034061ef0cc8d471ebc683.zip
s390/decompressor: avoid constant startup.a rebuilds
Correct merging error which replaced startup.a in targets list with non-existing setup.a. Due to missing startup.a in targets list if_changed triggered startup.a rebuild unconditionally. Fixes: 3e200c54438d ("s390/decompressor: avoid reusing uncompressed image objects") Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/boot/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile
index a1ca3b805c74..e15baa7b8e0b 100644
--- a/arch/s390/boot/Makefile
+++ b/arch/s390/boot/Makefile
@@ -28,7 +28,7 @@ endif
CFLAGS_sclp_early_core.o += -I$(srctree)/drivers/s390/char
obj-y := head.o als.o ebcdic.o sclp_early_core.o mem.o
-targets := bzImage setup.a $(obj-y)
+targets := bzImage startup.a $(obj-y)
subdir- := compressed
OBJECTS := $(addprefix $(obj)/,$(obj-y))