diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-06-25 10:16:44 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-06-25 10:16:44 -0400 |
commit | 9a15a07fe2175dc25cd928a354b3839f562ac8cc (patch) | |
tree | 09b470f3cf153c1d4f621cafc475ca1d22f7f6d3 /tools/perf/builtin-record.c | |
parent | ffabd99e051e73344efe4e53d58f11643f180512 (diff) | |
parent | 830f4c803196eec181e209110885c4ac130f3805 (diff) |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
Diffstat (limited to 'tools/perf/builtin-record.c')
-rw-r--r-- | tools/perf/builtin-record.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 86b1c3b6264e..0df64088135f 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c | |||
@@ -445,8 +445,6 @@ static void atexit_header(void) | |||
445 | static void event__synthesize_guest_os(struct machine *machine, void *data) | 445 | static void event__synthesize_guest_os(struct machine *machine, void *data) |
446 | { | 446 | { |
447 | int err; | 447 | int err; |
448 | char *guest_kallsyms; | ||
449 | char path[PATH_MAX]; | ||
450 | struct perf_session *psession = data; | 448 | struct perf_session *psession = data; |
451 | 449 | ||
452 | if (machine__is_host(machine)) | 450 | if (machine__is_host(machine)) |
@@ -466,13 +464,6 @@ static void event__synthesize_guest_os(struct machine *machine, void *data) | |||
466 | pr_err("Couldn't record guest kernel [%d]'s reference" | 464 | pr_err("Couldn't record guest kernel [%d]'s reference" |
467 | " relocation symbol.\n", machine->pid); | 465 | " relocation symbol.\n", machine->pid); |
468 | 466 | ||
469 | if (machine__is_default_guest(machine)) | ||
470 | guest_kallsyms = (char *) symbol_conf.default_guest_kallsyms; | ||
471 | else { | ||
472 | sprintf(path, "%s/proc/kallsyms", machine->root_dir); | ||
473 | guest_kallsyms = path; | ||
474 | } | ||
475 | |||
476 | /* | 467 | /* |
477 | * We use _stext for guest kernel because guest kernel's /proc/kallsyms | 468 | * We use _stext for guest kernel because guest kernel's /proc/kallsyms |
478 | * have no _text sometimes. | 469 | * have no _text sometimes. |