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/config/Makefile | |
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/config/Makefile')
-rw-r--r-- | tools/perf/config/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 729bbdf5cec7..4f100b54ba8b 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile | |||
@@ -447,6 +447,7 @@ else | |||
447 | ifneq ($(feature-libperl), 1) | 447 | ifneq ($(feature-libperl), 1) |
448 | CFLAGS += -DNO_LIBPERL | 448 | CFLAGS += -DNO_LIBPERL |
449 | NO_LIBPERL := 1 | 449 | NO_LIBPERL := 1 |
450 | msg := $(warning Missing perl devel files. Disabling perl scripting support, consider installing perl-ExtUtils-Embed); | ||
450 | else | 451 | else |
451 | LDFLAGS += $(PERL_EMBED_LDFLAGS) | 452 | LDFLAGS += $(PERL_EMBED_LDFLAGS) |
452 | EXTLIBS += $(PERL_EMBED_LIBADD) | 453 | EXTLIBS += $(PERL_EMBED_LIBADD) |
@@ -599,7 +600,7 @@ endif | |||
599 | 600 | ||
600 | # Make the path relative to DESTDIR, not to prefix | 601 | # Make the path relative to DESTDIR, not to prefix |
601 | ifndef DESTDIR | 602 | ifndef DESTDIR |
602 | prefix = $(HOME) | 603 | prefix ?= $(HOME) |
603 | endif | 604 | endif |
604 | bindir_relative = bin | 605 | bindir_relative = bin |
605 | bindir = $(prefix)/$(bindir_relative) | 606 | bindir = $(prefix)/$(bindir_relative) |