summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2014-05-23 13:18:27 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2014-05-27 10:26:04 +0200
commitcedbecd60a8effc66dc8bed4e5489ff9365c9b19 (patch)
tree6123830246b9a5680d0cd159ef1d88e9985067b9
parents390/cio: remove weird assignment during argument evaluation (diff)
downloadlinux-cedbecd60a8effc66dc8bed4e5489ff9365c9b19.tar.xz
linux-cedbecd60a8effc66dc8bed4e5489ff9365c9b19.zip
s390/boot: fix boot of compressed kernel built with gcc 4.9
Add -fno-delete-null-pointer-checks to CFLAGS for the code in arch/s390/boot. Without the option a compressed kernel built with gcc 4.9 won't boot. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/boot/compressed/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/boot/compressed/Makefile b/arch/s390/boot/compressed/Makefile
index 866ecbe670e4..f90d1fc6d603 100644
--- a/arch/s390/boot/compressed/Makefile
+++ b/arch/s390/boot/compressed/Makefile
@@ -12,7 +12,7 @@ targets += misc.o piggy.o sizes.h head$(BITS).o
KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2
KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
-KBUILD_CFLAGS += $(cflags-y)
+KBUILD_CFLAGS += $(cflags-y) -fno-delete-null-pointer-checks
KBUILD_CFLAGS += $(call cc-option,-mpacked-stack)
KBUILD_CFLAGS += $(call cc-option,-ffreestanding)