diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 15:37:55 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 15:37:55 -0400 |
commit | b31a76546c08f618e355bd12a7cc138c045374b7 (patch) | |
tree | bc1aba4774e8f4910253c1eb409de278178dfed5 /tools | |
parent | 4a77a932b9958ffd393581cd5350ca0ef39711de (diff) | |
parent | 45853507c9362b0bd606b37e8c7c7e7551caa78b (diff) |
Merge tag 'omap-for-v3.11/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards
From Tony Lindgren:
Minor board changes for v3.11 merge window. These are
tapering down finally as we're getting closer to making
omap2+ DT only.
* tag 'omap-for-v3.11/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: omap2plus_defconfig: enable USB_PHY and NOP_USB_XCEIV
ARM: OMAP1: nokia770: enable Tahvo
ARM: OMAP3EVM: Marking omap3_evm_display_init() with CONFIG_BROKEN
arm: omap: board-overo: reset GPIO for SMSC911x
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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) | |||
2191 | 2191 | ||
2192 | void allocate_output_buffer() | 2192 | void allocate_output_buffer() |
2193 | { | 2193 | { |
2194 | output_buffer = calloc(1, (1 + topo.num_cpus) * 128); | 2194 | output_buffer = calloc(1, (1 + topo.num_cpus) * 256); |
2195 | outp = output_buffer; | 2195 | outp = output_buffer; |
2196 | if (outp == NULL) { | 2196 | if (outp == NULL) { |
2197 | perror("calloc"); | 2197 | perror("calloc"); |