History

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

Pull perf fixes from Ingo Molnar: "This is larger than usual: the main reason are the ARM symbol lookup speedups that came in late and were hard to resist. There's also a kprobes fix and various tooling fixes, plus the minimal re-enablement of the mmap2 support interface" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (36 commits) x86/kprobes: Fix build errors and blacklist context_track_user perf tests: Add test for closing dso objects on EMFILE error perf tests: Add test for caching dso file descriptors perf tests: Allow reuse of test_file function perf tests: Spawn child for each test perf tools: Add dso__data_* interface descriptons perf tools: Allow to close dso fd in case of open failure perf tools: Add file size check and factor dso__data_read_offset perf tools: Cache dso data file descriptor perf tools: Add global count of opened dso objects perf tools: Add global list of opened dso objects perf tools: Add data_fd into dso object perf tools: Separate dso data related variables perf tools: Cache register accesses for unwind processing perf record: Fix to honor user freq/interval properly perf timechart: Reflow documentation perf probe: Improve error messages in --line option perf probe: Improve an error message of perf probe --vars mode perf probe: Show error code and description in verbose mode perf probe: Improve error message for unknown member of data structure ...

Linus Torvalds committed 12 years ago

Commit 401c58f2 parents 7b08d61 cf2309141 files · +1249 −126Browse files

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

Unified · Split

include/uapi/linux/perf_event.h+1−0
@@ -705,6 +705,7 @@ enum perf_event_type { · 704 unmodified lines
705 * u32 min;705 * u32 min;
706 * u64 ino;706 * u64 ino;
707 * u64 ino_generation;707 * u64 ino_generation;
708 * u32 prot, flags;
708 * char filename[];709 * char filename[];
709 * struct sample_id sample_id;710 * struct sample_id sample_id;
710 * };711 * };