From: Heiko Carstens Date: Fri, 14 Sep 2012 11:22:48 +0000 (+0200) Subject: s390/ipl,decrompressor: disable branch profiling X-Git-Tag: MMI-PSA29.97-13-9~15904^2~17 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1a0f24878eb5ca56dff5f20b9f0e716947dc0394;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git s390/ipl,decrompressor: disable branch profiling The early kernel decrompressing code can't call into the kernel in order to profile branches. Fixes this link error: arch/s390/boot/compressed/misc.o: In function `decompress_kernel': misc.c:(.text+0x9a6): undefined reference to `ftrace_likely_update' Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky --- diff --git a/arch/s390/boot/compressed/Makefile b/arch/s390/boot/compressed/Makefile index 10e22c4ec4a7..3ad8f61c9985 100644 --- a/arch/s390/boot/compressed/Makefile +++ b/arch/s390/boot/compressed/Makefile @@ -11,6 +11,7 @@ targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 \ 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 += $(call cc-option,-mpacked-stack) KBUILD_CFLAGS += $(call cc-option,-ffreestanding)