diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2013-06-21 08:13:55 +0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-06-21 08:13:55 +0400 |
| commit | e6bca5a6a8a0cdc41a9e1e3e69bc8476ac6a8ed4 (patch) | |
| tree | 2651a8a7b81ee71113bdeda8425a2083f2842b20 /tools | |
| parent | e8747f10ba3f7638b1c1fcab9c66a01733213d45 (diff) | |
| parent | 7d132055814ef17a6c7b69f342244c410a5e000f (diff) | |
| download | linux-e6bca5a6a8a0cdc41a9e1e3e69bc8476ac6a8ed4.tar.xz | |
Merge tag 'v3.10-rc6' into x86/cleanups
Linux 3.10-rc6
We need a change that is the mainline tree for further work.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/power/x86/turbostat/turbostat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index 9e9d34871195..fe702076ca46 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -2191,7 +2191,7 @@ int initialize_counters(int cpu_id) void allocate_output_buffer() { - output_buffer = calloc(1, (1 + topo.num_cpus) * 128); + output_buffer = calloc(1, (1 + topo.num_cpus) * 256); outp = output_buffer; if (outp == NULL) { perror("calloc"); |