diff options
| author | Patryk Wlazlyn <patryk.wlazlyn@linux.intel.com> | 2024-05-24 12:06:39 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2024-06-28 06:04:33 +0200 |
| commit | c81c8ee445e84703cd90171365ed596ef94399cc (patch) | |
| tree | feeed4f693480fc7d76d2bfee805ff3b688f5c98 /tools/power/x86 | |
| parent | tools/power/turbostat: Switch to new Intel CPU model defines (diff) | |
| download | linux-c81c8ee445e84703cd90171365ed596ef94399cc.tar.xz linux-c81c8ee445e84703cd90171365ed596ef94399cc.zip | |
tools/power turbostat: Remove anonymous union from rapl_counter_info_t
fd_perf field used to be part of the union, but later moved out of it,
because we test it with fd_perf != -1 to determine if any perf counter
is opened, making the union unused.
Signed-off-by: Patryk Wlazlyn <patryk.wlazlyn@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'tools/power/x86')
| -rw-r--r-- | tools/power/x86/turbostat/turbostat.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index 02312e62c857..1ac74cd49cc9 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -1085,15 +1085,9 @@ struct rapl_counter_info_t { unsigned long long flags[NUM_RAPL_COUNTERS]; double scale[NUM_RAPL_COUNTERS]; enum rapl_unit unit[NUM_RAPL_COUNTERS]; - - union { - /* Active when source == RAPL_SOURCE_MSR */ - struct { - unsigned long long msr[NUM_RAPL_COUNTERS]; - unsigned long long msr_mask[NUM_RAPL_COUNTERS]; - int msr_shift[NUM_RAPL_COUNTERS]; - }; - }; + unsigned long long msr[NUM_RAPL_COUNTERS]; + unsigned long long msr_mask[NUM_RAPL_COUNTERS]; + int msr_shift[NUM_RAPL_COUNTERS]; int fd_perf; }; |