summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-08-05 11:53:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2021-08-05 11:53:34 -0700
commit3c3e9027071c979cfa7e48d9c2a39a4d56829236 (patch)
tree5d590c4d3406d2b87c1008efe6958b6ed839c52e /Makefile
parent130951bbc61f59133ed04e244db25a63edc6935f (diff)
parent51397dc6f283bb570e1cf8226017d300d8ea1f5b (diff)
downloadlinux-stable-3c3e9027071c979cfa7e48d9c2a39a4d56829236.tar.gz
linux-stable-3c3e9027071c979cfa7e48d9c2a39a4d56829236.tar.bz2
linux-stable-3c3e9027071c979cfa7e48d9c2a39a4d56829236.zip
Merge tag 'trace-v5.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt: "Various tracing fixes: - Fix NULL pointer dereference caused by an error path - Give histogram calculation fields a size, otherwise it breaks synthetic creation based on them. - Reject strings being used for number calculations. - Fix recordmcount.pl warning on llvm building RISC-V allmodconfig - Fix the draw_functrace.py script to handle the new trace output - Fix warning of smp_processor_id() in preemptible code" * tag 'trace-v5.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: tracing: Quiet smp_processor_id() use in preemptable warning in hwlat scripts/tracing: fix the bug that can't parse raw_trace_func scripts/recordmcount.pl: Remove check_objcopy() and $can_use_local tracing: Reject string operand in the histogram expression tracing / histogram: Give calculation hist_fields a size tracing: Fix NULL pointer dereference in start_creating
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 27a072cffcb9..b6ee64dd435e 100644
--- a/Makefile
+++ b/Makefile
@@ -546,7 +546,6 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
PHONY += scripts_basic
scripts_basic:
$(Q)$(MAKE) $(build)=scripts/basic
- $(Q)rm -f .tmp_quiet_recordmcount
PHONY += outputmakefile
ifdef building_out_of_srctree