diff options
author | Jonathan Corbet <corbet@lwn.net> | 2019-10-29 11:43:29 +0100 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2019-10-29 11:43:29 +0100 |
commit | 822bbba0cabb50825a0ce22707dc45eb82d02853 (patch) | |
tree | ea61d4ca72cb60b4cae8e95f64eefa7cd2a36603 /tools/perf/builtin-kvm.c | |
parent | Documentation/scheduler: fix links in sched-stats (diff) | |
parent | Linux 5.4-rc4 (diff) | |
download | linux-822bbba0cabb50825a0ce22707dc45eb82d02853.tar.xz linux-822bbba0cabb50825a0ce22707dc45eb82d02853.zip |
Merge tag 'v5.4-rc4' into docs-next
I need to pick up the independent changes made to
Documentation/core-api/memory-allocation.rst to be able to merge further
work without creating a total mess.
Diffstat (limited to 'tools/perf/builtin-kvm.c')
-rw-r--r-- | tools/perf/builtin-kvm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index 2227e2f42c09..58a9e0989491 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -705,14 +705,15 @@ static int process_sample_event(struct perf_tool *tool, static int cpu_isa_config(struct perf_kvm_stat *kvm) { - char buf[64], *cpuid; + char buf[128], *cpuid; int err; if (kvm->live) { err = get_cpuid(buf, sizeof(buf)); if (err != 0) { - pr_err("Failed to look up CPU type\n"); - return err; + pr_err("Failed to look up CPU type: %s\n", + str_error_r(err, buf, sizeof(buf))); + return -err; } cpuid = buf; } else |