diff options
| author | Jan Kara <jack@suse.cz> | 2019-11-06 10:52:10 +0100 | 
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2019-11-06 10:52:10 +0100 | 
| commit | dae82c7fd0926840c832151f3258ba751f73d348 (patch) | |
| tree | 5cdef8359f6cfb964919ffb0bfa36d2de60140b1 /tools/perf/arch/s390/annotate/instructions.c | |
| parent | a9913d7eafa74eb2e34e26aa31fe80449b999f8e (diff) | |
| parent | a0828b6ccbdfd46afbbaa9f28df359081c29109b (diff) | |
Pull series refactoring quota enabling and disabling code.
Diffstat (limited to 'tools/perf/arch/s390/annotate/instructions.c')
| -rw-r--r-- | tools/perf/arch/s390/annotate/instructions.c | 6 | 
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/perf/arch/s390/annotate/instructions.c b/tools/perf/arch/s390/annotate/instructions.c index 89bb8f2c54ce..a50e70baf918 100644 --- a/tools/perf/arch/s390/annotate/instructions.c +++ b/tools/perf/arch/s390/annotate/instructions.c @@ -164,8 +164,10 @@ static int s390__annotate_init(struct arch *arch, char *cpuid __maybe_unused)  	if (!arch->initialized) {  		arch->initialized = true;  		arch->associate_instruction_ops = s390__associate_ins_ops; -		if (cpuid) -			err = s390__cpuid_parse(arch, cpuid); +		if (cpuid) { +			if (s390__cpuid_parse(arch, cpuid)) +				err = SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_CPUID_PARSING; +		}  	}  	return err;  | 
