OSDN Git Service

ARM: 8373/1: disable branch profiling in uncompressor
authorArnd Bergmann <arnd@arndb.de>
Tue, 26 May 2015 14:39:36 +0000 (15:39 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 27 May 2015 23:29:14 +0000 (00:29 +0100)
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>
arch/arm/boot/compressed/Makefile

index 6e1fb2b..7a13aeb 100644 (file)
@@ -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))