diff options
author | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2015-11-23 05:36:12 -0500 |
---|---|---|
committer | David Vrabel <david.vrabel@citrix.com> | 2015-12-21 09:40:55 -0500 |
commit | cfafae940381207d48b11a73a211142dba5947d3 (patch) | |
tree | ced7aa811e7013fcbc08fa9b2880a1e204425402 /arch/x86/xen/enlighten.c | |
parent | 34e38523d586ae1e838241d44c8a2e9a1c9e0b43 (diff) |
xen: rename dom0_op to platform_op
The dom0_op hypercall has been renamed to platform_op since Xen 3.2,
which is ancient, and modern upstream Linux kernels cannot run as dom0
and it anymore anyway.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Diffstat (limited to 'arch/x86/xen/enlighten.c')
-rw-r--r-- | arch/x86/xen/enlighten.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 5774800ff583..f963c40fae01 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
@@ -415,7 +415,7 @@ static bool __init xen_check_mwait(void) | |||
415 | 415 | ||
416 | set_xen_guest_handle(op.u.set_pminfo.pdc, buf); | 416 | set_xen_guest_handle(op.u.set_pminfo.pdc, buf); |
417 | 417 | ||
418 | if ((HYPERVISOR_dom0_op(&op) == 0) && | 418 | if ((HYPERVISOR_platform_op(&op) == 0) && |
419 | (buf[2] & (ACPI_PDC_C_C1_FFH | ACPI_PDC_C_C2C3_FFH))) { | 419 | (buf[2] & (ACPI_PDC_C_C1_FFH | ACPI_PDC_C_C2C3_FFH))) { |
420 | cpuid_leaf5_ecx_val = cx; | 420 | cpuid_leaf5_ecx_val = cx; |
421 | cpuid_leaf5_edx_val = dx; | 421 | cpuid_leaf5_edx_val = dx; |
@@ -1374,7 +1374,7 @@ static void __init xen_boot_params_init_edd(void) | |||
1374 | info->params.length = sizeof(info->params); | 1374 | info->params.length = sizeof(info->params); |
1375 | set_xen_guest_handle(op.u.firmware_info.u.disk_info.edd_params, | 1375 | set_xen_guest_handle(op.u.firmware_info.u.disk_info.edd_params, |
1376 | &info->params); | 1376 | &info->params); |
1377 | ret = HYPERVISOR_dom0_op(&op); | 1377 | ret = HYPERVISOR_platform_op(&op); |
1378 | if (ret) | 1378 | if (ret) |
1379 | break; | 1379 | break; |
1380 | 1380 | ||
@@ -1392,7 +1392,7 @@ static void __init xen_boot_params_init_edd(void) | |||
1392 | op.u.firmware_info.type = XEN_FW_DISK_MBR_SIGNATURE; | 1392 | op.u.firmware_info.type = XEN_FW_DISK_MBR_SIGNATURE; |
1393 | for (nr = 0; nr < EDD_MBR_SIG_MAX; nr++) { | 1393 | for (nr = 0; nr < EDD_MBR_SIG_MAX; nr++) { |
1394 | op.u.firmware_info.index = nr; | 1394 | op.u.firmware_info.index = nr; |
1395 | ret = HYPERVISOR_dom0_op(&op); | 1395 | ret = HYPERVISOR_platform_op(&op); |
1396 | if (ret) | 1396 | if (ret) |
1397 | break; | 1397 | break; |
1398 | mbr_signature[nr] = op.u.firmware_info.u.disk_mbr_signature.mbr_signature; | 1398 | mbr_signature[nr] = op.u.firmware_info.u.disk_mbr_signature.mbr_signature; |
@@ -1698,7 +1698,7 @@ asmlinkage __visible void __init xen_start_kernel(void) | |||
1698 | xen_start_info->console.domU.mfn = 0; | 1698 | xen_start_info->console.domU.mfn = 0; |
1699 | xen_start_info->console.domU.evtchn = 0; | 1699 | xen_start_info->console.domU.evtchn = 0; |
1700 | 1700 | ||
1701 | if (HYPERVISOR_dom0_op(&op) == 0) | 1701 | if (HYPERVISOR_platform_op(&op) == 0) |
1702 | boot_params.kbd_status = op.u.firmware_info.u.kbd_shift_flags; | 1702 | boot_params.kbd_status = op.u.firmware_info.u.kbd_shift_flags; |
1703 | 1703 | ||
1704 | /* Make sure ACS will be enabled */ | 1704 | /* Make sure ACS will be enabled */ |