diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-03-05 09:05:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-03-05 09:05:44 +0100 |
| commit | b7c924274c456499264d1cfa3d44063bb11eb5db (patch) | |
| tree | 4494b12fe85f4a4f088a82588d23b2e19e6500ad /tools/perf/util | |
| parent | 1018faa6cf23b256bf25919ef203cd7c129f06f2 (diff) | |
| parent | bc76efe64533305b55d1f0834fd03414da8a12b2 (diff) | |
| download | linux-b7c924274c456499264d1cfa3d44063bb11eb5db.tar.gz linux-b7c924274c456499264d1cfa3d44063bb11eb5db.tar.bz2 linux-b7c924274c456499264d1cfa3d44063bb11eb5db.zip | |
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Cherry picked fixes from perf/core, together with the kernel fix (1018faa),
the sampling tools (top, record) are back working on AMD systems.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/util')
| -rw-r--r-- | tools/perf/util/top.h | 1 | ||||
| -rw-r--r-- | tools/perf/util/util.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/util/top.h b/tools/perf/util/top.h index a248f3c2c60d..f2eab81435ae 100644 --- a/tools/perf/util/top.h +++ b/tools/perf/util/top.h @@ -34,6 +34,7 @@ struct perf_top { bool inherit; bool group; bool sample_id_all_avail; + bool exclude_guest_missing; bool dump_symtab; const char *cpu_list; struct hist_entry *sym_filter_entry; diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c index 813141047fc2..fb25d1329218 100644 --- a/tools/perf/util/util.c +++ b/tools/perf/util/util.c @@ -6,7 +6,7 @@ * XXX We need to find a better place for these things... */ bool perf_host = true; -bool perf_guest = true; +bool perf_guest = false; void event_attr_init(struct perf_event_attr *attr) { |