Module Name: src
Committed By: martin
Date: Sat Nov 16 16:51:45 UTC 2019
Modified Files:
src/sys/dev/hyperv [netbsd-9]: hvkbd.c if_hvn.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #428):
sys/dev/hyperv/if_hvn.c: revision 1.6
sys/dev/hyperv/hvkbd.c: revision 1.4
hvn(4), hvkbd(4): No need to call vmbus_channel_setdeferred().
These devices do not perform batch reading.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.2.1 src/sys/dev/hyperv/hvkbd.c
cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/dev/hyperv/if_hvn.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/hyperv/hvkbd.c
diff -u src/sys/dev/hyperv/hvkbd.c:1.2 src/sys/dev/hyperv/hvkbd.c:1.2.2.1
--- src/sys/dev/hyperv/hvkbd.c:1.2 Sun Jul 21 16:08:13 2019
+++ src/sys/dev/hyperv/hvkbd.c Sat Nov 16 16:51:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hvkbd.c,v 1.2 2019/07/21 16:08:13 rin Exp $ */
+/* $NetBSD: hvkbd.c,v 1.2.2.1 2019/11/16 16:51:45 martin Exp $ */
/*-
* Copyright (c) 2017 Microsoft Corp.
@@ -36,7 +36,7 @@
#endif /* _KERNEL_OPT */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hvkbd.c,v 1.2 2019/07/21 16:08:13 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hvkbd.c,v 1.2.2.1 2019/11/16 16:51:45 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -216,12 +216,6 @@ hvkbd_attach(device_t parent, device_t s
return;
}
- if (vmbus_channel_setdeferred(sc->sc_chan, device_xname(self))) {
- aprint_error_dev(self,
- "failed to create the interrupt thread\n");
- goto free_buf;
- }
-
sc->sc_chan->ch_flags &= ~CHF_BATCHED;
if (vmbus_channel_open(sc->sc_chan,
HVKBD_TX_RING_SIZE + HVKBD_RX_RING_SIZE, NULL, 0, hvkbd_intr, sc)) {
Index: src/sys/dev/hyperv/if_hvn.c
diff -u src/sys/dev/hyperv/if_hvn.c:1.4 src/sys/dev/hyperv/if_hvn.c:1.4.2.1
--- src/sys/dev/hyperv/if_hvn.c:1.4 Tue Jul 9 08:46:58 2019
+++ src/sys/dev/hyperv/if_hvn.c Sat Nov 16 16:51:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hvn.c,v 1.4 2019/07/09 08:46:58 msaitoh Exp $ */
+/* $NetBSD: if_hvn.c,v 1.4.2.1 2019/11/16 16:51:45 martin Exp $ */
/* $OpenBSD: if_hvn.c,v 1.39 2018/03/11 14:31:34 mikeb Exp $ */
/*-
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.4 2019/07/09 08:46:58 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.4.2.1 2019/11/16 16:51:45 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -928,12 +928,6 @@ hvn_nvs_attach(struct hvn_softc *sc)
sc->sc_chan->ch_flags &= ~CHF_BATCHED;
- if (vmbus_channel_setdeferred(sc->sc_chan, device_xname(sc->sc_dev))) {
- aprint_error_dev(sc->sc_dev,
- "failed to create the interrupt thread\n");
- return -1;
- }
-
/* Associate our interrupt handler with the channel */
if (vmbus_channel_open(sc->sc_chan, ringsize, NULL, 0,
hvn_nvs_intr, sc)) {
