diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-11-11 08:34:59 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-11-11 08:34:59 +0100 |
| commit | 6d5a763c303bc9d78b17361d30b692ba2facf9b4 (patch) | |
| tree | 1ba7059e8b1c47eb075acc906f8ef01f9c490ba1 /tools/perf/arch/x86/annotate/instructions.c | |
| parent | e79b3ddad6790aabead5fb775456a5b0599e97ee (diff) | |
| parent | 31f4f5b495a62c9a8b15b1c3581acd5efeb9af8c (diff) | |
| download | linux-6d5a763c303bc9d78b17361d30b692ba2facf9b4.tar.bz2 | |
Merge tag 'v5.4-rc7' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/arch/x86/annotate/instructions.c')
| -rw-r--r-- | tools/perf/arch/x86/annotate/instructions.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/perf/arch/x86/annotate/instructions.c b/tools/perf/arch/x86/annotate/instructions.c index 44f5aba78210..7eb5621c021d 100644 --- a/tools/perf/arch/x86/annotate/instructions.c +++ b/tools/perf/arch/x86/annotate/instructions.c @@ -196,8 +196,10 @@ static int x86__annotate_init(struct arch *arch, char *cpuid) if (arch->initialized) return 0; - if (cpuid) - err = x86__cpuid_parse(arch, cpuid); + if (cpuid) { + if (x86__cpuid_parse(arch, cpuid)) + err = SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_CPUID_PARSING; + } arch->initialized = true; return err; |