3 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/pv/if_xnf.c b/sys/dev/pv/if_xnf.c
index c316e1b5dec..71db795b43f 100644
--- a/sys/dev/pv/if_xnf.c
+++ b/sys/dev/pv/if_xnf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_xnf.c,v 1.50 2017/02/08 16:17:31 mikeb Exp $	*/
+/*	$OpenBSD: if_xnf.c,v 1.51 2017/02/24 16:58:12 mikeb Exp $	*/
 
 /*
  * Copyright (c) 2015, 2016 Mike Belopuhov
@@ -269,7 +269,7 @@ xnf_attach(struct device *parent, struct device *self, void *aux)
 	}
 	xen_intr_mask(sc->sc_xih);
 
-	printf(" backend %d chan %u: address %s\n", sc->sc_domid,
+	printf(" backend %d channel %u: address %s\n", sc->sc_domid,
 	    sc->sc_xih, ether_sprintf(sc->sc_ac.ac_enaddr));
 
 	if (xnf_capabilities(sc)) {
diff --git a/sys/dev/pv/xbf.c b/sys/dev/pv/xbf.c
index 3abcd86b6ed..628f56af930 100644
--- a/sys/dev/pv/xbf.c
+++ b/sys/dev/pv/xbf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xbf.c,v 1.23 2017/02/08 17:39:57 mikeb Exp $	*/
+/*	$OpenBSD: xbf.c,v 1.24 2017/02/24 16:58:12 mikeb Exp $	*/
 
 /*
  * Copyright (c) 2016 Mike Belopuhov
@@ -267,7 +267,7 @@ xbf_attach(struct device *parent, struct device *self, void *aux)
 	}
 	xen_intr_mask(sc->sc_xih);
 
-	printf(" backend %d chan %u: %s\n", sc->sc_domid, sc->sc_xih,
+	printf(" backend %d channel %u: %s\n", sc->sc_domid, sc->sc_xih,
 	    sc->sc_dtype);
 
 	scsi_iopool_init(&sc->sc_iopool, sc, xbf_io_get, xbf_io_put);
diff --git a/sys/dev/pv/xen.c b/sys/dev/pv/xen.c
index 3ceda5540a7..5e7c9c98b5b 100644
--- a/sys/dev/pv/xen.c
+++ b/sys/dev/pv/xen.c
@@ -1,7 +1,7 @@
-/*	$OpenBSD: xen.c,v 1.78 2017/02/08 16:15:52 mikeb Exp $	*/
+/*	$OpenBSD: xen.c,v 1.79 2017/02/24 16:58:12 mikeb Exp $	*/
 
 /*
- * Copyright (c) 2015 Mike Belopuhov
+ * Copyright (c) 2015, 2016, 2017 Mike Belopuhov
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -1186,7 +1186,7 @@ xen_grant_table_remove(struct xen_softc *sc, grant_ref_t ref)
 	    (ge->ge_table[ref].domid << 16);
 	loop = 0;
 	while (atomic_cas_uint(ptr, flags, GTF_invalid) != flags) {
-		if (loop++ > 10000000) {
+		if (loop++ > 100000000) {
 			printf("%s: grant table reference %u is held "
 			    "by domain %d\n", sc->sc_dev.dv_xname, ref +
 			    ge->ge_start, ge->ge_table[ref].domid);