x86/cpu: remove hypervisor specific set_cpu_features

[karo-tx-linux.git] / arch / x86 / kernel / cpu / hypervisor.c

diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervisor.c
index 35691a6b0d325eb71f8c9695d2eecda957d838f3..4fa90006ac68cbeade534020a689c4a07b4f0e60 100644 (file)
--- a/arch/x86/kernel/cpu/hypervisor.c
+++ b/arch/x86/kernel/cpu/hypervisor.c
@@ -28,8 +28,11 @@
 
 static const __initconst struct hypervisor_x86 * const hypervisors[] =
 {
-#ifdef CONFIG_XEN
-       &x86_hyper_xen,
+#ifdef CONFIG_XEN_PV
+       &x86_hyper_xen_pv,
+#endif
+#ifdef CONFIG_XEN_PVHVM
+       &x86_hyper_xen_hvm,
 #endif
        &x86_hyper_vmware,
        &x86_hyper_ms_hyperv,
@@ -60,12 +63,6 @@ detect_hypervisor_vendor(void)
                pr_info("Hypervisor detected: %s\n", x86_hyper->name);
 }
 
-void init_hypervisor(struct cpuinfo_x86 *c)
-{
-       if (x86_hyper && x86_hyper->set_cpu_features)
-               x86_hyper->set_cpu_features(c);
-}
-
 void __init init_hypervisor_platform(void)
 {
 
@@ -74,8 +71,6 @@ void __init init_hypervisor_platform(void)
        if (!x86_hyper)
                return;
 
-       init_hypervisor(&boot_cpu_data);
-
        if (x86_hyper->init_platform)
                x86_hyper->init_platform();
 }