Merge commit 'upstream-x86-virt' into WIP.x86/mm
[muen/linux.git] / arch / x86 / xen / enlighten_pv.c
index e55d276afc709d6be1494c1a66adbb0ac00740d2..fbd054d6ac973d8402146c799c2fece6432e54e7 100644 (file)
@@ -1459,9 +1459,9 @@ static uint32_t __init xen_platform_pv(void)
        return 0;
 }
 
-const struct hypervisor_x86 x86_hyper_xen_pv = {
+const __initconst struct hypervisor_x86 x86_hyper_xen_pv = {
        .name                   = "Xen PV",
        .detect                 = xen_platform_pv,
-       .pin_vcpu               = xen_pin_vcpu,
+       .type                   = X86_HYPER_XEN_PV,
+       .runtime.pin_vcpu       = xen_pin_vcpu,
 };
-EXPORT_SYMBOL(x86_hyper_xen_pv);