[src/trunk]: src/sys/arch/xen/xen Also set x86_delay to xen_delay, unbreaks PVH

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f5a635db75f3
branches:  trunk
changeset: 971924:f5a635db75f3
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat May 09 08:01:38 2020 +0000

description:
Also set x86_delay to xen_delay, unbreaks PVH

diffstat:

 sys/arch/xen/xen/hypervisor.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r f4e63a65ec7d -r f5a635db75f3 sys/arch/xen/xen/hypervisor.c
--- a/sys/arch/xen/xen/hypervisor.c     Sat May 09 06:12:32 2020 +0000
+++ b/sys/arch/xen/xen/hypervisor.c     Sat May 09 08:01:38 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor.c,v 1.83 2020/05/08 17:28:33 bouyer Exp $ */
+/* $NetBSD: hypervisor.c,v 1.84 2020/05/09 08:01:38 bouyer Exp $ */
 
 /*
  * Copyright (c) 2005 Manuel Bouyer.
@@ -53,7 +53,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.83 2020/05/08 17:28:33 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.84 2020/05/09 08:01:38 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -258,7 +258,7 @@
                printk(
                    "Xen HVM: Unable to register HYPERVISOR_shared_info %d\n", err);
        }
-       delay_func = xen_delay;
+       delay_func = x86_delay = xen_delay;
        x86_initclock_func = xen_initclocks;
        x86_cpu_initclock_func = xen_cpu_initclocks;
        if (hvm_start_info->cmdline_paddr != 0) {
@@ -434,7 +434,7 @@
        xen_start_info.console.domU.evtchn = xen_hvm_param.value;
 
 
-       delay_func = xen_delay;
+       delay_func = x86_delay = xen_delay;
        x86_initclock_func = xen_initclocks;
        x86_cpu_initclock_func = xen_cpu_initclocks;