diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-08-04 13:11:22 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-08-04 13:11:22 +0400 |
commit | 2e65b8916cce4436df29812610d2c2fecdb42b5a (patch) | |
tree | fdcae670bd651c8e772eb7cd60420eba5d26a0db /tools/perf/util/util.c | |
parent | 7440850c20b69658f322119d20a94dc914127cc7 (diff) | |
parent | 00ef99408b6cc8d86ca614ada8025aa3606860db (diff) | |
download | linux-2e65b8916cce4436df29812610d2c2fecdb42b5a.tar.xz |
Merge branch 'for-next' into for-linus
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; |