Merge tag 'for-linus-4.5-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull xen updates from David Vrabel:
 "Xen features and fixes for 4.5-rc0:

   - Stolen ticks and PV wallclock support for arm/arm64

   - Add grant copy ioctl to gntdev device"

* tag 'for-linus-4.5-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/gntdev: add ioctl for grant copy
  x86/xen: don't reset vcpu_info on a cancelled suspend
  xen/gntdev: constify mmu_notifier_ops structures
  xen/grant-table: constify gnttab_ops structure
  xen/time: use READ_ONCE
  xen/x86: convert remaining timespec to timespec64 in xen_pvclock_gtod_notify
  xen/x86: support XENPF_settime64
  xen/arm: set the system time in Xen via the XENPF_settime64 hypercall
  xen/arm: introduce xen_read_wallclock
  arm: extend pvclock_wall_clock with sec_hi
  xen: introduce XENPF_settime64
  xen/arm: introduce HYPERVISOR_platform_op on arm and arm64
  xen: rename dom0_op to platform_op
  xen/arm: account for stolen ticks
  arm64: introduce CONFIG_PARAVIRT, PARAVIRT_TIME_ACCOUNTING and pv_time_ops
  arm: introduce CONFIG_PARAVIRT, PARAVIRT_TIME_ACCOUNTING and pv_time_ops
  missing include asm/paravirt.h in cputime.c
  xen: move xen_setup_runstate_info and get_runstate_snapshot to drivers/xen/time.c

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 23063923e364..d09e4c9d7cc5 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -415,7 +415,7 @@ static bool __init xen_check_mwait(void)
 
         set_xen_guest_handle(op.u.set_pminfo.pdc, buf);
 
-        if ((HYPERVISOR_dom0_op(&op) == 0) &&
+        if ((HYPERVISOR_platform_op(&op) == 0) &&
             (buf[2] & (ACPI_PDC_C_C1_FFH | ACPI_PDC_C_C2C3_FFH))) {
                 cpuid_leaf5_ecx_val = cx;
                 cpuid_leaf5_edx_val = dx;
@@ -1365,7 +1365,7 @@ static void __init xen_boot_params_init_edd(void)
                 info->params.length = sizeof(info->params);
                 set_xen_guest_handle(op.u.firmware_info.u.disk_info.edd_params,
                                      &info->params);
-                ret = HYPERVISOR_dom0_op(&op);
+                ret = HYPERVISOR_platform_op(&op);
                 if (ret)
                         break;
 
@@ -1383,7 +1383,7 @@ static void __init xen_boot_params_init_edd(void)
         op.u.firmware_info.type = XEN_FW_DISK_MBR_SIGNATURE;
         for (nr = 0; nr < EDD_MBR_SIG_MAX; nr++) {
                 op.u.firmware_info.index = nr;
-                ret = HYPERVISOR_dom0_op(&op);
+                ret = HYPERVISOR_platform_op(&op);
                 if (ret)
                         break;
                 mbr_signature[nr] = op.u.firmware_info.u.disk_mbr_signature.mbr_signature;
@@ -1690,7 +1690,7 @@ asmlinkage __visible void __init xen_start_kernel(void)
                 xen_start_info->console.domU.mfn = 0;
                 xen_start_info->console.domU.evtchn = 0;
 
-                if (HYPERVISOR_dom0_op(&op) == 0)
+                if (HYPERVISOR_platform_op(&op) == 0)
                         boot_params.kbd_status = op.u.firmware_info.u.kbd_shift_flags;
 
                 /* Make sure ACS will be enabled */