Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/xen/xenbus/xenbus_comms.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/xen/xenbus/xenbus_comms.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -p -r1.18 -r1.18.2.1
--- src/sys/arch/xen/xenbus/xenbus_comms.c	2018/06/24 13:35:33	1.18
+++ src/sys/arch/xen/xenbus/xenbus_comms.c	2019/06/10 22:06:56	1.18.2.1
@@ -1,4 +1,4 @@
-/* $NetBSD: xenbus_comms.c,v 1.18 2018/06/24 13:35:33 jdolecek Exp $ */
+/* $NetBSD: xenbus_comms.c,v 1.18.2.1 2019/06/10 22:06:56 christos Exp $ */
 /******************************************************************************
  * xenbus_comms.c
  *
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenbus_comms.c,v 1.18 2018/06/24 13:35:33 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenbus_comms.c,v 1.18.2.1 2019/06/10 22:06:56 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/null.h> 
@@ -221,10 +221,10 @@ xb_init_comms(device_t dev)
 
 	evtchn = xen_start_info.store_evtchn;
 
-	ih = intr_establish_xname(0, &xen_pic, evtchn, IST_LEVEL, IPL_TTY,
+	ih = xen_intr_establish_xname(-1, &xen_pic, evtchn, IST_LEVEL, IPL_TTY,
 	    wake_waiting, NULL, false, device_xname(dev));
 
-	hypervisor_enable_event(evtchn);
+	hypervisor_unmask_event(evtchn);
 	aprint_verbose_dev(dev, "using event channel %d\n", evtchn);
 
 	return 0;
@@ -238,7 +238,7 @@ xb_suspend_comms(device_t dev)
 	evtchn = xen_start_info.store_evtchn;
 
 	hypervisor_mask_event(evtchn);
-	intr_disestablish(ih);
+	xen_intr_disestablish(ih);
 	aprint_verbose_dev(dev, "removed event channel %d\n", evtchn);
 }