diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-06-13 08:47:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-06-13 08:47:22 +0200 |
| commit | 3f365cf304ba3d316b3df2474af8d7df6edd2455 (patch) | |
| tree | bb52465b35606bec268e9c1b88c746f8caf0f919 /tools/perf/util/build-id.h | |
| parent | bbf79d21bd4627a01ca8721c9373752819f8e4cc (diff) | |
| parent | 252d2a4117bc181b287eeddf848863788da733ae (diff) | |
| download | linux-3f365cf304ba3d316b3df2474af8d7df6edd2455.tar.bz2 | |
Merge branch 'sched/urgent' into x86/mm, to pick up dependent fix
Andy will need the following scheduler fix for the PCID series:
252d2a4117bc: sched/core: Idle_task_exit() shouldn't use switch_mm_irqs_off()
So do a cross-merge.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/build-id.h')
| -rw-r--r-- | tools/perf/util/build-id.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/perf/util/build-id.h b/tools/perf/util/build-id.h index 8a89b195c1fc..96690a55c62c 100644 --- a/tools/perf/util/build-id.h +++ b/tools/perf/util/build-id.h @@ -17,7 +17,6 @@ char *build_id_cache__kallsyms_path(const char *sbuild_id, char *bf, size_t size); char *dso__build_id_filename(const struct dso *dso, char *bf, size_t size); -bool dso__build_id_is_kmod(const struct dso *dso, char *bf, size_t size); int build_id__mark_dso_hit(struct perf_tool *tool, union perf_event *event, struct perf_sample *sample, struct perf_evsel *evsel, |