Commit 88a69dfb authored by Ingo Molnar's avatar Ingo Molnar

perf report: Fix HV bit mismerge

Fix:

 builtin-report.c: In function ‘hist_entry__add’:
 builtin-report.c:1015: error: case label not within a switch statement
 builtin-report.c:1017: error: break statement not within loop or switch

Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 61c45981
...@@ -964,6 +964,9 @@ resolve_callchain(struct thread *thread, struct map *map, ...@@ -964,6 +964,9 @@ resolve_callchain(struct thread *thread, struct map *map,
} }
switch (context) { switch (context) {
case PERF_CONTEXT_HV:
dso = hypervisor_dso;
break;
case PERF_CONTEXT_KERNEL: case PERF_CONTEXT_KERNEL:
dso = kernel_dso; dso = kernel_dso;
break; break;
...@@ -1012,9 +1015,6 @@ hist_entry__add(struct thread *thread, struct map *map, struct dso *dso, ...@@ -1012,9 +1015,6 @@ hist_entry__add(struct thread *thread, struct map *map, struct dso *dso,
}; };
int cmp; int cmp;
case PERF_CONTEXT_HV:
dso = hypervisor_dso;
break;
if ((sort__has_parent || callchain) && chain) if ((sort__has_parent || callchain) && chain)
syms = resolve_callchain(thread, map, chain, &entry); syms = resolve_callchain(thread, map, chain, &entry);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment