diff options
| author | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
| commit | ee3e542fec6e69bc9fb668698889a37d93950ddf (patch) | |
| tree | e74ee766a4764769ef1d3d45d266b4dea64101d3 /tools/perf/util/symbol.c | |
| parent | fe2a801b50c0bb8039d627e5ae1fec249d10ff39 (diff) | |
| parent | f1d6e17f540af37bb1891480143669ba7636c4cf (diff) | |
Merge remote-tracking branch 'linus/master' into testing
Diffstat (limited to 'tools/perf/util/symbol.c')
| -rw-r--r-- | tools/perf/util/symbol.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 8cf3b5426a9a..d5528e1cc03a 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c | |||
| @@ -32,7 +32,6 @@ int vmlinux_path__nr_entries; | |||
| 32 | char **vmlinux_path; | 32 | char **vmlinux_path; |
| 33 | 33 | ||
| 34 | struct symbol_conf symbol_conf = { | 34 | struct symbol_conf symbol_conf = { |
| 35 | .exclude_other = true, | ||
| 36 | .use_modules = true, | 35 | .use_modules = true, |
| 37 | .try_vmlinux_path = true, | 36 | .try_vmlinux_path = true, |
| 38 | .annotate_src = true, | 37 | .annotate_src = true, |