Merge branch 'kvm-5.16-fixes' into kvm-master

[sfrench/cifs-2.6.git] / arch / x86 / include / asm / processor.h

diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 191878a65c61a9817533133f7bf09dc07a20ac92..355d38c0cf60604c849a68ba8242f3767f61638a 100644 (file)
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -806,11 +806,14 @@ static inline u32 amd_get_nodes_per_socket(void)  { return 0; }
 static inline u32 amd_get_highest_perf(void)           { return 0; }
 #endif
 
+#define for_each_possible_hypervisor_cpuid_base(function) \
+       for (function = 0x40000000; function < 0x40010000; function += 0x100)
+
 static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
 {
        uint32_t base, eax, signature[3];
 
-       for (base = 0x40000000; base < 0x40010000; base += 0x100) {
+       for_each_possible_hypervisor_cpuid_base(base) {
                cpuid(base, &eax, &signature[0], &signature[1], &signature[2]);
 
                if (!memcmp(sig, signature, 12) &&