Index: sys/xen/xen_intr.c
===================================================================
--- sys/xen/xen_intr.c
+++ sys/xen/xen_intr.c
@@ -166,7 +166,7 @@
  *        event channel globally, use evtchn_mask().
  */
 static inline void
-evtchn_cpu_mask_port(u_int cpu, evtchn_port_t port)
+xen_intr_cpu_mask_port(u_int cpu, evtchn_port_t port)
 {
 	struct xen_intr_pcpu_data *pcpu;
 
@@ -188,7 +188,7 @@
  *        also be globally enabled.  See evtchn_unmask().
  */
 static inline void
-evtchn_cpu_unmask_port(u_int cpu, evtchn_port_t port)
+xen_intr_cpu_unmask_port(u_int cpu, evtchn_port_t port)
 {
 	struct xen_intr_pcpu_data *pcpu;
 
@@ -231,8 +231,8 @@
 	evtchn_clear_port(isrc->xi_port);
 
 	/* Rebind port to CPU 0. */
-	evtchn_cpu_mask_port(isrc->xi_cpu, isrc->xi_port);
-	evtchn_cpu_unmask_port(0, isrc->xi_port);
+	xen_intr_cpu_mask_port(isrc->xi_cpu, isrc->xi_port);
+	xen_intr_cpu_unmask_port(0, isrc->xi_port);
 
 	if (isrc->xi_port < NR_EVENT_CHANNELS) {
 		if (isrc->xi_close != 0) {
@@ -703,9 +703,9 @@
 		 * the Hypervisor at evtchn_bind_virq time, so
 		 * all we need to do is update the per-CPU masks.
 		 */
-		evtchn_cpu_mask_port(isrc->xi_cpu, isrc->xi_port);
+		xen_intr_cpu_mask_port(isrc->xi_cpu, isrc->xi_port);
 		isrc->xi_cpu = to_cpu;
-		evtchn_cpu_unmask_port(isrc->xi_cpu, isrc->xi_port);
+		xen_intr_cpu_unmask_port(isrc->xi_cpu, isrc->xi_port);
 		goto out;
 	}
 
@@ -716,9 +716,9 @@
 	if (isrc->xi_cpu != to_cpu) {
 		if (error == 0) {
 			/* Commit to new binding by removing the old one. */
-			evtchn_cpu_mask_port(isrc->xi_cpu, isrc->xi_port);
+			xen_intr_cpu_mask_port(isrc->xi_cpu, isrc->xi_port);
 			isrc->xi_cpu = to_cpu;
-			evtchn_cpu_unmask_port(isrc->xi_cpu, isrc->xi_port);
+			xen_intr_cpu_unmask_port(isrc->xi_cpu, isrc->xi_port);
 		}
 	}