summaryrefslogtreecommitdiff
path: root/tools/power
diff options
context:
space:
mode:
authorJosh Triplett <josh@joshtriplett.org>2013-06-12 17:26:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-06-13 09:55:56 -0700
commitb844db31874e3b1c3b86c65024ac7bed9f77ee42 (patch)
tree7a88339c7c723b24d00011b19375a1ea5ea887d7 /tools/power
parent26e04462c8b78d079d3231396ec72d58a14f114b (diff)
downloadlinux-stable-b844db31874e3b1c3b86c65024ac7bed9f77ee42.tar.gz
linux-stable-b844db31874e3b1c3b86c65024ac7bed9f77ee42.tar.bz2
linux-stable-b844db31874e3b1c3b86c65024ac7bed9f77ee42.zip
turbostat: Increase output buffer size to accommodate C8-C10
On platforms with C8-C10 support, the additional C-states cause turbostat to overrun its output buffer of 128 bytes per CPU. Increase this to 256 bytes per CPU. [ As a bugfix, this should go into 3.10; however, since the C8-C10 support didn't go in until after 3.9, this need not go into any stable kernel. ] Signed-off-by: Josh Triplett <josh@joshtriplett.org> Cc: Len Brown <len.brown@intel.com> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'tools/power')
-rw-r--r--tools/power/x86/turbostat/turbostat.c2
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");