git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'docs-5.0' of git://git.lwn.net/linux
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
compressed
/
Makefile
diff --git
a/arch/arm/boot/compressed/Makefile
b/arch/arm/boot/compressed/Makefile
index 1f5a5ffe7fcf84b5da64bc74747c50384f5bfeea..01bf2585a0fa08f0dfe4ff35167f4526d183c61f 100644
(file)
--- a/
arch/arm/boot/compressed/Makefile
+++ b/
arch/arm/boot/compressed/Makefile
@@
-101,6
+101,7
@@
clean-files += piggy_data lib1funcs.S ashldi3.S bswapsdi2.S \
$(libfdt) $(libfdt_hdrs) hyp-stub.S
KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
+KBUILD_CFLAGS += $(DISABLE_ARM_SSP_PER_TASK_PLUGIN)
ifeq ($(CONFIG_FUNCTION_TRACER),y)
ORIG_CFLAGS := $(KBUILD_CFLAGS)