diff options
author | Borislav Petkov <bp@suse.de> | 2021-10-04 17:37:22 +0200 |
---|---|---|
committer | Borislav Petkov <bp@suse.de> | 2021-10-04 17:37:22 +0200 |
commit | c7419a6e1aa3219ff62045ab6e56e37d5ad2d292 (patch) | |
tree | a5145db864629e50196ba0f13e0b1c80f7d4331a /tools/perf/arch/x86/util/iostat.c | |
parent | x86: Increase exception stack sizes (diff) | |
parent | treewide: Replace the use of mem_encrypt_active() with cc_platform_has() (diff) | |
download | linux-c7419a6e1aa3219ff62045ab6e56e37d5ad2d292.tar.xz linux-c7419a6e1aa3219ff62045ab6e56e37d5ad2d292.zip |
Merge branch x86/cc into x86/core
Pick up dependent cc_platform_has() changes.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'tools/perf/arch/x86/util/iostat.c')
-rw-r--r-- | tools/perf/arch/x86/util/iostat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/arch/x86/util/iostat.c b/tools/perf/arch/x86/util/iostat.c index eeafe97b8105..792cd75ade33 100644 --- a/tools/perf/arch/x86/util/iostat.c +++ b/tools/perf/arch/x86/util/iostat.c @@ -432,7 +432,7 @@ void iostat_print_metric(struct perf_stat_config *config, struct evsel *evsel, u8 die = ((struct iio_root_port *)evsel->priv)->die; struct perf_counts_values *count = perf_counts(evsel->counts, die, 0); - if (count->run && count->ena) { + if (count && count->run && count->ena) { if (evsel->prev_raw_counts && !out->force_header) { struct perf_counts_values *prev_count = perf_counts(evsel->prev_raw_counts, die, 0); |