History

Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf updates from Ingo Molnar: "Kernel side changes: - Improved kbprobes robustness - Intel PEBS support for PT hardware tracing - Other Intel PT improvements: high order pages memory footprint reduction and various related cleanups - Misc cleanups The perf tooling side has been very busy in this cycle, with over 300 commits. This is an incomplete high-level summary of the many improvements done by over 30 developers: - Lots of updates to the following tools: 'perf c2c' 'perf config' 'perf record' 'perf report' 'perf script' 'perf test' 'perf top' 'perf trace' - Updates to libperf and libtraceevent, and a consolidation of the proliferation of x86 instruction decoder libraries. - Vendor event updates for Intel and PowerPC CPUs, - Updates to hardware tracing tooling for ARM and Intel CPUs, - ... and lots of other changes and cleanups - see the shortlog and Git log for details" * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (322 commits) kprobes: Prohibit probing on BUG() and WARN() address perf/x86: Make more stuff static x86, perf: Fix the dependency of the x86 insn decoder selftest objtool: Ignore intentional differences for the x86 insn decoder objtool: Update sync-check.sh from perf's check-headers.sh perf build: Ignore intentional differences for the x86 insn decoder perf intel-pt: Use shared x86 insn decoder perf intel-pt: Remove inat.c from build dependency list perf: Update .gitignore file objtool: Move x86 insn decoder to a common location perf metricgroup: Support multiple events for metricgroup perf metricgroup: Scale the metric result perf pmu: Change convert_scale from static to global perf symbols: Move mem_info and branch_info out of symbol.h perf auxtrace: Uninline functions that touch perf_session perf tools: Remove needless evlist.h include directives perf tools: Remove needless evlist.h include directives perf tools: Remove needless thread_map.h include directives perf tools: Remove needless thread.h include directives perf tools: Remove needless map.h include directives ...

Linus Torvalds committed 7 years ago

Commit 772c1d02 parents c7eba51 e336b40441 files · +13375 −8857Browse files

Showing the changes to include/uapi/linux (1 of 441 files). Show all

Unified · Split

include/uapi/linux/perf_event.h+2−1
@@ -374,7 +374,8 @@ struct perf_event_attr { · 373 unmodified lines
374 namespaces : 1, /* include namespaces data */374 namespaces : 1, /* include namespaces data */
375 ksymbol : 1, /* include ksymbol events */375 ksymbol : 1, /* include ksymbol events */
376 bpf_event : 1, /* include bpf events */376 bpf_event : 1, /* include bpf events */
377 __reserved_1 : 33;377 aux_output : 1, /* generate AUX records instead of events */
378 __reserved_1 : 32;
378 379
379 union {380 union {
380 __u32 wakeup_events; /* wakeup every n events */381 __u32 wakeup_events; /* wakeup every n events */