diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-08 01:38:53 +0300 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-08 01:38:53 +0300 | 
| commit | dcde237b9b0eb1d19306e6f48c0a4e058907619f (patch) | |
| tree | fab31c522e95cae26c90c76a5b59d2e1ad407d23 /tools/perf/builtin-script.c | |
| parent | 6d12075ddeedc38d25c5b74e929e686158da728c (diff) | |
| parent | bee9ca1c8a237ca178f281062bf162637071ab04 (diff) | |
| download | linux-dcde237b9b0eb1d19306e6f48c0a4e058907619f.tar.xz | |
Merge tag 'perf-tools-fixes-2020-07-07' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux
Pull perf tooling fixes from Arnaldo Carvalho de Melo:
 - Intel PT fixes for PEBS-via-PT with registers
 - Fixes for Intel PT python based GUI
 - Avoid duplicated sideband events with Intel PT in system wide tracing
 - Remove needless 'dummy' event from TUI menu, used when synthesizing
   meta data events for pre-existing processes
 - Fix corner case segfault when pressing enter in a screen without
   entries in the TUI for report/top
 - Fixes for time stamp handling in libtraceevent
 - Explicitly set utf-8 encoding in perf flamegraph
 - Update arch/x86/lib/memcpy_64.S copy used in 'perf bench mem memcpy',
   silencing perf build warning
* tag 'perf-tools-fixes-2020-07-07' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux:
  perf report TUI: Remove needless 'dummy' event from menu
  perf intel-pt: Fix PEBS sample for XMM registers
  perf intel-pt: Fix displaying PEBS-via-PT with registers
  perf intel-pt: Fix recording PEBS-via-PT with registers
  perf report TUI: Fix segmentation fault in perf_evsel__hists_browse()
  tools lib traceevent: Add proper KBUFFER_TYPE_TIME_STAMP handling
  tools lib traceevent: Add API to read time information from kbuffer
  perf scripts python: exported-sql-viewer.py: Fix time chart call tree
  perf scripts python: exported-sql-viewer.py: Fix zero id in call tree 'Find' result
  perf scripts python: exported-sql-viewer.py: Fix zero id in call graph 'Find' result
  perf scripts python: exported-sql-viewer.py: Fix unexpanded 'Find' result
  perf record: Fix duplicated sideband events with Intel PT system wide tracing
  perf scripts python: export-to-postgresql.py: Fix struct.pack() int argument
  tools arch: Update arch/x86/lib/memcpy_64.S copy used in 'perf bench mem memcpy'
  perf flamegraph: Explicitly set utf-8 encoding
Diffstat (limited to 'tools/perf/builtin-script.c')
| -rw-r--r-- | tools/perf/builtin-script.c | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 181d65e5a450..447457786362 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -462,7 +462,7 @@ static int perf_evsel__check_attr(struct evsel *evsel, struct perf_session *sess  		return -EINVAL;  	if (PRINT_FIELD(IREGS) && -	    evsel__check_stype(evsel, PERF_SAMPLE_REGS_INTR, "IREGS", PERF_OUTPUT_IREGS)) +	    evsel__do_check_stype(evsel, PERF_SAMPLE_REGS_INTR, "IREGS", PERF_OUTPUT_IREGS, allow_user_set))  		return -EINVAL;  	if (PRINT_FIELD(UREGS) &&  | 
