--- /dev/null
+From 68e76e034b6b1c1ce2eece1ab8ae4008e14be470 Mon Sep 17 00:00:00 2001
+From: Randy Dunlap <rdunlap@infradead.org>
+Date: Mon, 15 Jan 2018 11:07:27 -0800
+Subject: tracing: Prevent PROFILE_ALL_BRANCHES when FORTIFY_SOURCE=y
+
+From: Randy Dunlap <rdunlap@infradead.org>
+
+commit 68e76e034b6b1c1ce2eece1ab8ae4008e14be470 upstream.
+
+I regularly get 50 MB - 60 MB files during kernel randconfig builds.
+These large files mostly contain (many repeats of; e.g., 124,594):
+
+In file included from ../include/linux/string.h:6:0,
+ from ../include/linux/uuid.h:20,
+ from ../include/linux/mod_devicetable.h:13,
+ from ../scripts/mod/devicetable-offsets.c:3:
+../include/linux/compiler.h:64:4: warning: '______f' is static but declared in inline function 'strcpy' which is not static [enabled by default]
+ ______f = { \
+ ^
+../include/linux/compiler.h:56:23: note: in expansion of macro '__trace_if'
+ ^
+../include/linux/string.h:425:2: note: in expansion of macro 'if'
+ if (p_size == (size_t)-1 && q_size == (size_t)-1)
+ ^
+
+This only happens when CONFIG_FORTIFY_SOURCE=y and
+CONFIG_PROFILE_ALL_BRANCHES=y, so prevent PROFILE_ALL_BRANCHES if
+FORTIFY_SOURCE=y.
+
+Link: http://lkml.kernel.org/r/9199446b-a141-c0c3-9678-a3f9107f2750@infradead.org
+
+Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+Cc: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ kernel/trace/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/kernel/trace/Kconfig
++++ b/kernel/trace/Kconfig
+@@ -343,7 +343,7 @@ config PROFILE_ANNOTATED_BRANCHES
+ on if you need to profile the system's use of these macros.
+
+ config PROFILE_ALL_BRANCHES
+- bool "Profile all if conditionals"
++ bool "Profile all if conditionals" if !FORTIFY_SOURCE
+ select TRACE_BRANCH_PROFILING
+ help
+ This tracer profiles all branch conditions. Every if ()