From: Jason Wang Date: Fri, 31 Aug 2012 05:32:44 +0000 (+0800) Subject: hv: vmbus_drv: detect hyperv through x86_hyper X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~76^2~56 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f94ea8181a9305a5d5cf635a6a4e9ac8ee3d2c3;p=pandora-kernel.git hv: vmbus_drv: detect hyperv through x86_hyper There are two reasons we need to use x86_hyper instead of query_hypervisor_presence(): - Not only hyperv but also other hypervisors such as kvm would set X86_FEATURE_HYTPERVISOR, so query_hypervisor_presence() will return true even in kvm. This may cause extra delay of 5 seconds before failing the probing in kvm guest. - The hypervisor has been detected in init_hypervisor(), so no need to do the work again. Signed-off-by: Jason Wang Cc: Haiyang Zhang Acked-by: K. Y. Srinivasan Signed-off-by: Greg Kroah-Hartman --- Reading git-diff-tree failed