diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-26 15:39:36 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-05-28 00:29:14 +0100 |
| commit | 8c36a75748d0208e41e6fe7817c631ac8075eeef (patch) | |
| tree | 5f9cc8992f8dd9e35da4ad16acc417de80e6f52b | |
| parent | cfeec79eb2587e0efc43c219558d70939d31bdc9 (diff) | |
| download | linux-8c36a75748d0208e41e6fe7817c631ac8075eeef.tar.gz linux-8c36a75748d0208e41e6fe7817c631ac8075eeef.tar.bz2 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>
| -rw-r--r-- | arch/arm/boot/compressed/Makefile | 2 |
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)) |