aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/cpu/vmware.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c
index a0905ecfe7d2..c034bda842d9 100644
--- a/arch/x86/kernel/cpu/vmware.c
+++ b/arch/x86/kernel/cpu/vmware.c
@@ -61,6 +61,11 @@ static unsigned long __vmware_get_tsc_khz(void)
61 return tsc_hz; 61 return tsc_hz;
62} 62}
63 63
64/*
65 * While checking the dmi string infomation, just checking the product
66 * serial key should be enough, as this will always have a VMware
67 * specific string when running under VMware hypervisor.
68 */
64int vmware_platform(void) 69int vmware_platform(void)
65{ 70{
66 if (cpu_has_hypervisor) { 71 if (cpu_has_hypervisor) {
@@ -74,7 +79,7 @@ int vmware_platform(void)
74 hyper_vendor_id[12] = '\0'; 79 hyper_vendor_id[12] = '\0';
75 if (!strcmp(hyper_vendor_id, "VMwareVMware")) 80 if (!strcmp(hyper_vendor_id, "VMwareVMware"))
76 return 1; 81 return 1;
77 } else if (dmi_available && dmi_name_in_vendors("VMware") && 82 } else if (dmi_available && dmi_name_in_serial("VMware") &&
78 __vmware_platform()) 83 __vmware_platform())
79 return 1; 84 return 1;
80 85