[PATCH 0/2] [GIT PULL] tracing: Two small fixes

From: Steven Rostedt
Date: Mon Jun 20 2016 - 09:54:41 EST



Linus,

Two fixes for the tracing system.

o When trace_printk() is used with a non constant format descriptor,
it adds a NULL pointer into the trace format section, and the code
isn't prepared to deal with it. This bug appeared by a change that
was added in v3.5.

o The ftracetest (selftests section) can't handle testing histograms
when histograms are not configured. Currently it shows that they
fail the test, when they should state that they are unsupported.
This bug was added in the 4.7 merge window with the addition of
the historgram code.

Please pull the latest trace-v4.7-rc3 tree, which can be found at:


git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
trace-v4.7-rc3

Tag SHA1: ae75242b4ca18af8d75769d4885c7584ae5a5d4c
Head SHA1: 0ded5174e976e2b2a354fe38abf1ebf4492c6dc3


Steven Rostedt (Red Hat) (2):
tracing: Handle NULL formats in hold_module_trace_bprintk_format()
ftracetest: Fix hist unsupported result in hist selftests

----
kernel/trace/trace_printk.c | 7 ++++++-
.../testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc | 9 ++++-----
tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc | 9 ++++-----
.../testing/selftests/ftrace/test.d/trigger/trigger-multihist.tc | 9 ++++-----
4 files changed, 18 insertions(+), 16 deletions(-)