diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-12 22:18:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-12 22:18:49 -0400 |
commit | 3737a12761636ebde0f09ef49daebb8eed18cc8a (patch) | |
tree | 965057f4bccd97049f8c0140f8670c5d4278ca3e /tools/perf/Makefile.perf | |
parent | c29deef32e3699e40da3e9e82267610de04e6b54 (diff) | |
parent | 82b897782d10fcc4930c9d4a15b175348fdd2871 (diff) |
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull more perf updates from Ingo Molnar:
"A second round of perf updates:
- wide reaching kprobes sanitization and robustization, with the hope
of fixing all 'probe this function crashes the kernel' bugs, by
Masami Hiramatsu.
- uprobes updates from Oleg Nesterov: tmpfs support, corner case
fixes and robustization work.
- perf tooling updates and fixes from Jiri Olsa, Namhyung Ki, Arnaldo
et al:
* Add support to accumulate hist periods (Namhyung Kim)
* various fixes, refactorings and enhancements"
* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (101 commits)
perf: Differentiate exec() and non-exec() comm events
perf: Fix perf_event_comm() vs. exec() assumption
uprobes/x86: Rename arch_uprobe->def to ->defparam, minor comment updates
perf/documentation: Add description for conditional branch filter
perf/x86: Add conditional branch filtering support
perf/tool: Add conditional branch filter 'cond' to perf record
perf: Add new conditional branch filter 'PERF_SAMPLE_BRANCH_COND'
uprobes: Teach copy_insn() to support tmpfs
uprobes: Shift ->readpage check from __copy_insn() to uprobe_register()
perf/x86: Use common PMU interrupt disabled code
perf/ARM: Use common PMU interrupt disabled code
perf: Disable sampled events if no PMU interrupt
perf: Fix use after free in perf_remove_from_context()
perf tools: Fix 'make help' message error
perf record: Fix poll return value propagation
perf tools: Move elide bool into perf_hpp_fmt struct
perf tools: Remove elide setup for SORT_MODE__MEMORY mode
perf tools: Fix "==" into "=" in ui_browser__warning assignment
perf tools: Allow overriding sysfs and proc finding with env var
perf tools: Consider header files outside perf directory in tags target
...
Diffstat (limited to 'tools/perf/Makefile.perf')
-rw-r--r-- | tools/perf/Makefile.perf | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 02f0a4dd1a80..ae20edfcc3f7 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf | |||
@@ -400,6 +400,7 @@ LIB_OBJS += $(OUTPUT)tests/hists_common.o | |||
400 | LIB_OBJS += $(OUTPUT)tests/hists_link.o | 400 | LIB_OBJS += $(OUTPUT)tests/hists_link.o |
401 | LIB_OBJS += $(OUTPUT)tests/hists_filter.o | 401 | LIB_OBJS += $(OUTPUT)tests/hists_filter.o |
402 | LIB_OBJS += $(OUTPUT)tests/hists_output.o | 402 | LIB_OBJS += $(OUTPUT)tests/hists_output.o |
403 | LIB_OBJS += $(OUTPUT)tests/hists_cumulate.o | ||
403 | LIB_OBJS += $(OUTPUT)tests/python-use.o | 404 | LIB_OBJS += $(OUTPUT)tests/python-use.o |
404 | LIB_OBJS += $(OUTPUT)tests/bp_signal.o | 405 | LIB_OBJS += $(OUTPUT)tests/bp_signal.o |
405 | LIB_OBJS += $(OUTPUT)tests/bp_signal_overflow.o | 406 | LIB_OBJS += $(OUTPUT)tests/bp_signal_overflow.o |
@@ -788,8 +789,8 @@ help: | |||
788 | @echo '' | 789 | @echo '' |
789 | @echo 'Perf install targets:' | 790 | @echo 'Perf install targets:' |
790 | @echo ' NOTE: documentation build requires asciidoc, xmlto packages to be installed' | 791 | @echo ' NOTE: documentation build requires asciidoc, xmlto packages to be installed' |
791 | @echo ' HINT: use "make prefix=<path> <install target>" to install to a particular' | 792 | @echo ' HINT: use "prefix" or "DESTDIR" to install to a particular' |
792 | @echo ' path like make prefix=/usr/local install install-doc' | 793 | @echo ' path like "make prefix=/usr/local install install-doc"' |
793 | @echo ' install - install compiled binaries' | 794 | @echo ' install - install compiled binaries' |
794 | @echo ' install-doc - install *all* documentation' | 795 | @echo ' install-doc - install *all* documentation' |
795 | @echo ' install-man - install manpage documentation' | 796 | @echo ' install-man - install manpage documentation' |
@@ -814,17 +815,20 @@ INSTALL_DOC_TARGETS += quick-install-doc quick-install-man quick-install-html | |||
814 | $(DOC_TARGETS): | 815 | $(DOC_TARGETS): |
815 | $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) $(@:doc=all) | 816 | $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) $(@:doc=all) |
816 | 817 | ||
818 | TAG_FOLDERS= . ../lib/traceevent ../lib/api ../lib/symbol | ||
819 | TAG_FILES= ../../include/uapi/linux/perf_event.h | ||
820 | |||
817 | TAGS: | 821 | TAGS: |
818 | $(RM) TAGS | 822 | $(RM) TAGS |
819 | $(FIND) . -name '*.[hcS]' -print | xargs etags -a | 823 | $(FIND) $(TAG_FOLDERS) -name '*.[hcS]' -print | xargs etags -a $(TAG_FILES) |
820 | 824 | ||
821 | tags: | 825 | tags: |
822 | $(RM) tags | 826 | $(RM) tags |
823 | $(FIND) . -name '*.[hcS]' -print | xargs ctags -a | 827 | $(FIND) $(TAG_FOLDERS) -name '*.[hcS]' -print | xargs ctags -a $(TAG_FILES) |
824 | 828 | ||
825 | cscope: | 829 | cscope: |
826 | $(RM) cscope* | 830 | $(RM) cscope* |
827 | $(FIND) . -name '*.[hcS]' -print | xargs cscope -b | 831 | $(FIND) $(TAG_FOLDERS) -name '*.[hcS]' -print | xargs cscope -b $(TAG_FILES) |
828 | 832 | ||
829 | ### Detect prefix changes | 833 | ### Detect prefix changes |
830 | TRACK_CFLAGS = $(subst ','\'',$(CFLAGS)):\ | 834 | TRACK_CFLAGS = $(subst ','\'',$(CFLAGS)):\ |