summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/compressed
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-05-26 16:39:36 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-05-28 01:29:14 +0200
commit8c36a75748d0208e41e6fe7817c631ac8075eeef (patch)
tree5f9cc8992f8dd9e35da4ad16acc417de80e6f52b /arch/arm/boot/compressed
parentARM: 8372/1: KGDB does not build on BE32 (diff)
downloadlinux-8c36a75748d0208e41e6fe7817c631ac8075eeef.tar.xz
linux-8c36a75748d0208e41e6fe7817c631ac8075eeef.zip
ARM: 8373/1: disable branch profiling in uncompressor
The branch profiling code cannot work outside of the main kernel and just causes link errors if we try to use it in the decompressor. Disabling it here matches what we do for other architectures. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/boot/compressed')
-rw-r--r--arch/arm/boot/compressed/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 6e1fb2b2ecc7..7a13aebacf81 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -103,6 +103,8 @@ extra-y += piggy.gzip piggy.lzo piggy.lzma piggy.xzkern piggy.lz4 \
lib1funcs.S ashldi3.S bswapsdi2.S $(libfdt) $(libfdt_hdrs) \
hyp-stub.S
+KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
+
ifeq ($(CONFIG_FUNCTION_TRACER),y)
ORIG_CFLAGS := $(KBUILD_CFLAGS)
KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))