diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-26 14:25:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-26 14:25:21 -0400 |
| commit | d207ea8e74ff45be0838afa12bdd2492fa9dc8bc (patch) | |
| tree | 97cfb3ed5c1bb42790e98e62b823526f61000b9f /tools/lib/traceevent/plugin_scsi.c | |
| parent | 2a8a2b7c49d6eb5f3348892c4676267376cfd40b (diff) | |
| parent | 66e5db4a1ccc64f278653bc69dc406d184dc750a (diff) | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf updates from Thomas Gleixner:
"Kernel:
- Improve kallsyms coverage
- Add x86 entry trampolines to kcore
- Fix ARM SPE handling
- Correct PPC event post processing
Tools:
- Make the build system more robust
- Small fixes and enhancements all over the place
- Update kernel ABI header copies
- Preparatory work for converting libtraceevnt to a shared library
- License cleanups"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (100 commits)
tools arch: Update arch/x86/lib/memcpy_64.S copy used in 'perf bench mem memcpy'
tools arch x86: Update tools's copy of cpufeatures.h
perf python: Fix pyrf_evlist__read_on_cpu() interface
perf mmap: Store real cpu number in 'struct perf_mmap'
perf tools: Remove ext from struct kmod_path
perf tools: Add gzip_is_compressed function
perf tools: Add lzma_is_compressed function
perf tools: Add is_compressed callback to compressions array
perf tools: Move the temp file processing into decompress_kmodule
perf tools: Use compression id in decompress_kmodule()
perf tools: Store compression id into struct dso
perf tools: Add compression id into 'struct kmod_path'
perf tools: Make is_supported_compression() static
perf tools: Make decompress_to_file() function static
perf tools: Get rid of dso__needs_decompress() call in __open_dso()
perf tools: Get rid of dso__needs_decompress() call in symbol__disassemble()
perf tools: Get rid of dso__needs_decompress() call in read_object_code()
tools lib traceevent: Change to SPDX License format
perf llvm: Allow passing options to llc in addition to clang
perf parser: Improve error message for PMU address filters
...
Diffstat (limited to 'tools/lib/traceevent/plugin_scsi.c')
| -rw-r--r-- | tools/lib/traceevent/plugin_scsi.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tools/lib/traceevent/plugin_scsi.c b/tools/lib/traceevent/plugin_scsi.c index 5e750af2b461..5ec346f6b842 100644 --- a/tools/lib/traceevent/plugin_scsi.c +++ b/tools/lib/traceevent/plugin_scsi.c | |||
| @@ -413,21 +413,21 @@ unsigned long long process_scsi_trace_parse_cdb(struct trace_seq *s, | |||
| 413 | return 0; | 413 | return 0; |
| 414 | } | 414 | } |
| 415 | 415 | ||
| 416 | int PEVENT_PLUGIN_LOADER(struct pevent *pevent) | 416 | int TEP_PLUGIN_LOADER(struct tep_handle *pevent) |
| 417 | { | 417 | { |
| 418 | pevent_register_print_function(pevent, | 418 | tep_register_print_function(pevent, |
| 419 | process_scsi_trace_parse_cdb, | 419 | process_scsi_trace_parse_cdb, |
| 420 | PEVENT_FUNC_ARG_STRING, | 420 | TEP_FUNC_ARG_STRING, |
| 421 | "scsi_trace_parse_cdb", | 421 | "scsi_trace_parse_cdb", |
| 422 | PEVENT_FUNC_ARG_PTR, | 422 | TEP_FUNC_ARG_PTR, |
| 423 | PEVENT_FUNC_ARG_PTR, | 423 | TEP_FUNC_ARG_PTR, |
| 424 | PEVENT_FUNC_ARG_INT, | 424 | TEP_FUNC_ARG_INT, |
| 425 | PEVENT_FUNC_ARG_VOID); | 425 | TEP_FUNC_ARG_VOID); |
| 426 | return 0; | 426 | return 0; |
| 427 | } | 427 | } |
| 428 | 428 | ||
| 429 | void PEVENT_PLUGIN_UNLOADER(struct pevent *pevent) | 429 | void TEP_PLUGIN_UNLOADER(struct tep_handle *pevent) |
| 430 | { | 430 | { |
| 431 | pevent_unregister_print_function(pevent, process_scsi_trace_parse_cdb, | 431 | tep_unregister_print_function(pevent, process_scsi_trace_parse_cdb, |
| 432 | "scsi_trace_parse_cdb"); | 432 | "scsi_trace_parse_cdb"); |
| 433 | } | 433 | } |
