diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-25 02:22:49 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-25 02:22:49 -0500 |
| commit | 993e5ee67a90c7b6a5dbb61b9c31df2955afff46 (patch) | |
| tree | 76a86f597ad07e908d1d6470d7501ecfacbac4f2 /tools/lib | |
| parent | bb236de5d9509c1c6ea5ce0680f000002e731ee2 (diff) | |
| parent | 4afc81cd1caa93daa50c1c29a3ab747c978abc13 (diff) | |
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
* Fix traceevent plugin path definitions (Josh Boyer)
* Load map before using map->map_ip() (Masami Hiramatsu)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/traceevent/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile index 56d52a33a3df..005c9cc06935 100644 --- a/tools/lib/traceevent/Makefile +++ b/tools/lib/traceevent/Makefile | |||
| @@ -63,7 +63,7 @@ endif | |||
| 63 | endif | 63 | endif |
| 64 | 64 | ||
| 65 | ifeq ($(set_plugin_dir),1) | 65 | ifeq ($(set_plugin_dir),1) |
| 66 | PLUGIN_DIR = -DPLUGIN_DIR="$(DESTDIR)/$(plugin_dir)" | 66 | PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)" |
| 67 | PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))' | 67 | PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))' |
| 68 | endif | 68 | endif |
| 69 | 69 | ||