diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-30 09:58:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-30 09:58:05 +0200 |
| commit | bc4b473f1aa2ef785ccfd890a24a1de5a6660f98 (patch) | |
| tree | 77bbea692517ae4723b575631222bf715b4a1eb1 /tools/perf/util/session.c | |
| parent | 3ca50496c2677a2b3fdd3ede86660fd1433beac6 (diff) | |
| parent | 1c6a800cde3b818fd8320b5d402f2d77d2948c00 (diff) | |
Merge branch 'perf' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
Diffstat (limited to 'tools/perf/util/session.c')
| -rw-r--r-- | tools/perf/util/session.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index b7aade2184b..a8dd73ed158 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -69,12 +69,11 @@ void perf_session__update_sample_type(struct perf_session *self) int perf_session__create_kernel_maps(struct perf_session *self) { - int ret; - struct rb_root *root = &self->kerninfo_root; + struct rb_root *machines = &self->machines; + int ret = machines__create_kernel_maps(machines, HOST_KERNEL_ID); - ret = map_groups__create_kernel_maps(root, HOST_KERNEL_ID); if (ret >= 0) - ret = map_groups__create_guest_kernel_maps(root); + ret = machines__create_guest_kernel_maps(machines); return ret; } @@ -97,7 +96,7 @@ struct perf_session *perf_session__new(const char *filename, int mode, bool forc self->cwd = NULL; self->cwdlen = 0; self->unknown_events = 0; - self->kerninfo_root = RB_ROOT; + self->machines = RB_ROOT; self->ordered_samples.flush_limit = ULLONG_MAX; INIT_LIST_HEAD(&self->ordered_samples.samples_head); |