diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-06-14 14:10:08 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-06-14 14:10:08 +0200 |
commit | cf230918cda19532e4a5cc4f0d5c82fa7e5e94f6 (patch) | |
tree | 9eed06e09fbbe3764f47e4da7f8d15b5965f6cb3 /tools/perf/util/util.c | |
parent | 4cdf77a828b056258f48a9f6078bd2f77d9704bb (diff) | |
parent | 4ba96195051be30160af6d5f5f83f9a055ab1f23 (diff) | |
download | linux-cf230918cda19532e4a5cc4f0d5c82fa7e5e94f6.tar.gz linux-cf230918cda19532e4a5cc4f0d5c82fa7e5e94f6.tar.bz2 linux-cf230918cda19532e4a5cc4f0d5c82fa7e5e94f6.zip |
Merge branch 'perf/core' into perf/urgent, to pick up the latest fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/util.c')
-rw-r--r-- | tools/perf/util/util.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c index 7fff6be07f07..95aefa78bb07 100644 --- a/tools/perf/util/util.c +++ b/tools/perf/util/util.c @@ -17,6 +17,7 @@ * XXX We need to find a better place for these things... */ unsigned int page_size; +int cacheline_size; bool test_attr__enabled; |