summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2012-09-14 13:22:48 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2012-09-26 15:45:21 +0200
commit1a0f24878eb5ca56dff5f20b9f0e716947dc0394 (patch)
treecf863abf5ae113716d1e203c1915c59358a7a372 /arch/s390
parent305e4f108b683a96254d36f916ecab79dcc3ea4f (diff)
downloadop-kernel-dev-1a0f24878eb5ca56dff5f20b9f0e716947dc0394.zip
op-kernel-dev-1a0f24878eb5ca56dff5f20b9f0e716947dc0394.tar.gz
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 <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/boot/compressed/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/boot/compressed/Makefile b/arch/s390/boot/compressed/Makefile
index 10e22c4..3ad8f61 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)
OpenPOWER on IntegriCloud