aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEthan Zhao <haifeng.zhao@linux.intel.com>2025-01-27 09:38:37 +0800
committerSean Christopherson <seanjc@google.com>2025-02-12 10:16:29 -0800
commita11128ce16366d455a6f937e2a2d1aa2a8b2bd45 (patch)
tree4d059e84825e94a895b379902436552207a81d31
parentKVM: x86: Clear pv_unhalted on all transitions to KVM_MP_STATE_RUNNABLE (diff)
downloadlinux-rng-a11128ce16366d455a6f937e2a2d1aa2a8b2bd45.tar.xz
linux-rng-a11128ce16366d455a6f937e2a2d1aa2a8b2bd45.zip
KVM: x86/cpuid: add type suffix to decimal const 48 fix building warning
The default type of a decimal constant is determined by the magnitude of its value. If the value falls within the range of int, its type is int; otherwise, if it falls within the range of unsigned int, its type is unsigned int. This results in the constant 48 being of type int. In the following min call, g_phys_as = min(g_phys_as, 48); This leads to a building warning/error (CONFIG_KVM_WERROR=y) caused by the mismatch between the types of the two arguments to macro min. By adding the suffix U to explicitly declare the type of the constant, this issue is fixed. Signed-off-by: Ethan Zhao <haifeng.zhao@linux.intel.com> Link: https://lore.kernel.org/r/20250127013837.12983-1-haifeng.zhao@linux.intel.com Signed-off-by: Sean Christopherson <seanjc@google.com>
-rw-r--r--arch/x86/kvm/cpuid.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index 8eb3a88707f2..269ffbd5c2e0 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -1704,7 +1704,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function)
phys_as = entry->eax & 0xff;
g_phys_as = phys_as;
if (kvm_mmu_get_max_tdp_level() < 5)
- g_phys_as = min(g_phys_as, 48);
+ g_phys_as = min(g_phys_as, 48U);
}
entry->eax = phys_as | (virt_as << 8) | (g_phys_as << 16);