commit 1a0f24878eb5ca56dff5f20b9f0e716947dc0394
author Heiko Carstens <heiko.carstens@de.ibm.com> Fri Sep 14 13:22:48 2012 +0200
committer Martin Schwidefsky <schwidefsky@de.ibm.com> Wed Sep 26 15:45:21 2012 +0200
tree cf863abf5ae113716d1e203c1915c59358a7a372
parent 305e4f108b683a96254d36f916ecab79dcc3ea4f

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>

arch/s390/boot/compressed/Makefile

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 @@
 	   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)