summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-08-03 12:50:06 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-03 12:50:06 -0400
commitbf0f500bd0199aab613eb0ecb3412edd5472740d (patch)
treef9ef3d5177a177c05549560fb3ac7ef1a66ea949 /Makefile
parent4b2e0162e4ab1a976eec0a36ca0bd920b02bfff3 (diff)
parent7522c03ae307e657114ff909aec650304371a134 (diff)
downloadlinux-stable-bf0f500bd0199aab613eb0ecb3412edd5472740d.tar.gz
linux-stable-bf0f500bd0199aab613eb0ecb3412edd5472740d.tar.bz2
linux-stable-bf0f500bd0199aab613eb0ecb3412edd5472740d.zip
Merge tag 'trace-v4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt: "A few updates and fixes: - move the suppressing of the __builtin_return_address >0 warning to the tracing directory only. - metag recordmcount fix for newer glibc's - two tracing histogram fixes that were reported by KASAN" * tag 'trace-v4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: tracing: Fix use-after-free in hist_register_trigger() tracing: Fix use-after-free in hist_unreg_all/hist_enable_unreg_all Makefile: Mute warning for __builtin_return_address(>0) for tracing only ftrace/recordmcount: Work around for addition of metag magic but not relocations
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d6d401bf9d95..182a84d0b8ea 100644
--- a/Makefile
+++ b/Makefile
@@ -621,7 +621,6 @@ include arch/$(SRCARCH)/Makefile
KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,)
KBUILD_CFLAGS += $(call cc-disable-warning,maybe-uninitialized,)
-KBUILD_CFLAGS += $(call cc-disable-warning,frame-address,)
ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
KBUILD_CFLAGS += -Os