diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-06-12 13:53:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-06-12 13:53:16 +0200 |
| commit | 94eb153130ce2c5f5f4959c96ea8197475bd66b6 (patch) | |
| tree | 452c7fd4bd5d494d8b170fd5e840a5ae004e65ba /tools/perf/perf.c | |
| parent | 82b897782d10fcc4930c9d4a15b175348fdd2871 (diff) | |
| parent | 9b32ba71ba905b90610fc2aad77cb98a373c5624 (diff) | |
| download | blackbird-op-linux-94eb153130ce2c5f5f4959c96ea8197475bd66b6.tar.gz blackbird-op-linux-94eb153130ce2c5f5f4959c96ea8197475bd66b6.zip | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf into perf/core
Pull perf/core improvements and fixes from Jiri Olsa:
* Bitmask handling and plugin updates (Steven Rostedt)
* Fix pipe check regression in attr event callback (Jiri Olsa)
* Prettify the tags/TAGS/cscope targets output (Jiri Olsa)
* Print array argument as string (Namhyung Kim)
* Pass protection and flags bits through mmap2 interface (Peter Zijlstra)
* Update perf tool mmap2 interface with protection and flag bits (Don Zickus)
* Re-enable mmap interface (Don Zickus)
* Add mem-mode documentation to report command (Don Zickus)
* Add sort on dcacheline (Don Zickus)
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/perf.c')
| -rw-r--r-- | tools/perf/perf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/perf.c b/tools/perf/perf.c index 78f7b920e548..95c58fc15284 100644 --- a/tools/perf/perf.c +++ b/tools/perf/perf.c @@ -458,6 +458,7 @@ int main(int argc, const char **argv) /* The page_size is placed in util object. */ page_size = sysconf(_SC_PAGE_SIZE); + cacheline_size = sysconf(_SC_LEVEL1_DCACHE_LINESIZE); cmd = perf_extract_argv0_path(argv[0]); if (!cmd) |
