diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-07-27 11:08:48 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-07-27 11:08:48 -0300 |
| commit | 40d02efad9801c1277b092c83f6471a31e77c59b (patch) | |
| tree | 5b9c22e9a945023a505bf7425ffad1802fa79a68 /tools/include | |
| parent | a061a8ad3f906d331020006084558e2acddc2ff7 (diff) | |
| parent | 39c3c396f8131f3db454c80e0fcfcdc54ed9ec01 (diff) | |
| download | linux-40d02efad9801c1277b092c83f6471a31e77c59b.tar.gz | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To get upstream fixes. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/include')
| -rw-r--r-- | tools/include/uapi/linux/kvm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/include/uapi/linux/kvm.h b/tools/include/uapi/linux/kvm.h index 811897dadcae..860f867c50c0 100644 --- a/tools/include/uapi/linux/kvm.h +++ b/tools/include/uapi/linux/kvm.h @@ -2084,7 +2084,7 @@ struct kvm_stats_header { #define KVM_STATS_UNIT_SECONDS (0x2 << KVM_STATS_UNIT_SHIFT) #define KVM_STATS_UNIT_CYCLES (0x3 << KVM_STATS_UNIT_SHIFT) #define KVM_STATS_UNIT_BOOLEAN (0x4 << KVM_STATS_UNIT_SHIFT) -#define KVM_STATS_UNIT_MAX KVM_STATS_UNIT_CYCLES +#define KVM_STATS_UNIT_MAX KVM_STATS_UNIT_BOOLEAN #define KVM_STATS_BASE_SHIFT 8 #define KVM_STATS_BASE_MASK (0xF << KVM_STATS_BASE_SHIFT) |